Changeset 85234 in webkit

Timestamp:

Apr 28, 2011 1:49:52 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-28 Mark Pilgrim <​pilgrim@chromium.org>

Reviewed by Tony Chang.

IndexedDB put() should fail if second (key) parameter is null
​https://bugs.webkit.org/show_bug.cgi?id=58613

Added one test and fixed another that relied on old (broken) behavior
when passing null in second parameter.

• storage/indexeddb/mozilla/key-requirements-put-null-key-expected.txt: Added.
• storage/indexeddb/mozilla/key-requirements-put-null-key.html: Added.
• storage/indexeddb/objectstore-basics-expected.txt:
• storage/indexeddb/objectstore-basics.html:

2011-04-28 Mark Pilgrim <​pilgrim@chromium.org>

Reviewed by Tony Chang.

IndexedDB put() should fail if second (key) parameter is null
​https://bugs.webkit.org/show_bug.cgi?id=58613

If key arg is not specified, prpKey ends up as a null pointer in ::put().
However, if the key arg is specified but is null, prpKey ends up as a
valid IDBKey which has a null key type. As it happens, we need to be able
to detect the difference between these cases (the key arg is optional but
if specified must not be null).

Test: storage/indexeddb/mozilla/key-requirements-put-null-key.html

• storage/IDBObjectStoreBackendImpl.cpp: (WebCore::IDBObjectStoreBackendImpl::put):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/mozilla/key-requirements-put-null-key-expected.txt (added)
• LayoutTests/storage/indexeddb/mozilla/key-requirements-put-null-key.html (added)
• LayoutTests/storage/indexeddb/objectstore-basics-expected.txt (modified) (1 diff)
• LayoutTests/storage/indexeddb/objectstore-basics.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-28  Mark Pilgrim  <pilgrim@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        IndexedDB put() should fail if second (key) parameter is null
+        https://bugs.webkit.org/show_bug.cgi?id=58613
+
+        Added one test and fixed another that relied on old (broken) behavior
+        when passing null in second parameter.
+
+        * storage/indexeddb/mozilla/key-requirements-put-null-key-expected.txt: Added.
+        * storage/indexeddb/mozilla/key-requirements-put-null-key.html: Added.
+        * storage/indexeddb/objectstore-basics-expected.txt:
+        * storage/indexeddb/objectstore-basics.html:
+
 2011-04-28  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt

@@ -68 +68 @@
 db.transaction([], webkitIDBTransaction.READ_WRITE)
 store = transaction.objectStore('storeName')
-store.add({x: 'othervalue'}, null)
-addWithNullKeyFailre():
-PASS event.target.errorCode is webkitIDBDatabaseException.DATA_ERR
-event.preventDefault()
+Expecting exception from store.add({x: 'othervalue'}, null)
+PASS Exception was thrown.
+PASS code is webkitIDBDatabaseException.DATA_ERR
 db.transaction([], webkitIDBTransaction.READ_WRITE)
 store = transaction.objectStore('storeName')

trunk/LayoutTests/storage/indexeddb/objectstore-basics.html

@@ -186 +186 @@
     var store = evalAndLog("store = transaction.objectStore('storeName')");
 
-    request = evalAndLog("store.add({x: 'othervalue'}, null)");
-    request.onsuccess = unexpectedSuccessCallback;
-    request.addEventListener('error', addWithNullKeyFailure, true);
-}
-
-function addWithNullKeyFailure()
-{
-    debug("addWithNullKeyFailre():");
-    shouldBe("event.target.errorCode", "webkitIDBDatabaseException.DATA_ERR");
-
-    evalAndLog("event.preventDefault()");
+    evalAndExpectException("store.add({x: 'othervalue'}, null)", "webkitIDBDatabaseException.DATA_ERR");
 
     transaction = evalAndLog("db.transaction([], webkitIDBTransaction.READ_WRITE)");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-28  Mark Pilgrim  <pilgrim@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        IndexedDB put() should fail if second (key) parameter is null
+        https://bugs.webkit.org/show_bug.cgi?id=58613
+
+        If key arg is not specified, prpKey ends up as a null pointer in ::put().
+        However, if the key arg is specified but is null, prpKey ends up as a
+        valid IDBKey which has a null key type. As it happens, we need to be able
+        to detect the difference between these cases (the key arg is optional but
+        if specified must not be null).
+
+        Test: storage/indexeddb/mozilla/key-requirements-put-null-key.html
+
+        * storage/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::put):
+
 2011-04-07  David Levin  <levin@chromium.org>
 

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -131 +131 @@
     RefPtr<IDBCallbacks> callbacks = prpCallbacks;
     RefPtr<IDBTransactionBackendInterface> transaction = transactionPtr;
+
+    if (key && (key->type() == IDBKey::NullType)) {
+        ec = IDBDatabaseException::DATA_ERR;
+        return;
+    }
     // FIXME: This should throw a SERIAL_ERR on structured clone problems.
     // FIXME: This should throw a DATA_ERR when the wrong key/keyPath data is supplied.