Changeset 122173 in webkit

Timestamp:

Jul 9, 2012 5:48:10 PM (12 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: A null or undefined storeNames argument to IDBDatabase::transaction() should be coerced to string
​https://bugs.webkit.org/show_bug.cgi?id=90474

Reviewed by Tony Chang.

Source/WebCore:

Test: storage/indexeddb/transaction-basics.html

• Modules/indexeddb/IDBDatabase.cpp:

(WebCore::IDBDatabase::transaction):

• Modules/indexeddb/IDBDatabase.idl:

LayoutTests:

• storage/indexeddb/resources/transaction-basics.js:

(testInvalidMode):
(testDegenerateNames.request.onsuccess):
(testDegenerateNames.verifyDegenerateNames):
(testDegenerateNames):

• storage/indexeddb/transaction-basics-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/resources/transaction-basics.js (modified) (1 diff)
• LayoutTests/storage/indexeddb/transaction-basics-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBDatabase.idl (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-09  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: A null or undefined storeNames argument to IDBDatabase::transaction() should be coerced to string
+        https://bugs.webkit.org/show_bug.cgi?id=90474
+
+        Reviewed by Tony Chang.
+
+        * storage/indexeddb/resources/transaction-basics.js:
+        (testInvalidMode):
+        (testDegenerateNames.request.onsuccess):
+        (testDegenerateNames.verifyDegenerateNames):
+        (testDegenerateNames):
+        * storage/indexeddb/transaction-basics-expected.txt:
+
 2012-07-09  Vincent Scheib  <scheib@chromium.org>
 

trunk/LayoutTests/storage/indexeddb/resources/transaction-basics.js

@@ -281 +281 @@
     debug("Verify that specifying an invalid mode raises an exception");
     evalAndExpectException("db.transaction(['storeName'], 'lsakjdf')", "IDBDatabaseException.TYPE_ERR", "'TypeError'");
-    finishJSTest();
+    testDegenerateNames();
+}
+
+function testDegenerateNames()
+{
+    debug("");
+    debug("Test that null and undefined are treated as strings");
+
+    evalAndExpectException("db.transaction(null)", "DOMException.NOT_FOUND_ERR", "'NotFoundError'");
+    evalAndExpectException("db.transaction(undefined)", "DOMException.NOT_FOUND_ERR", "'NotFoundError'");
+
+    request = evalAndLog("db.setVersion('funny names')");
+    request.onerror = unexpectedErrorCallback;
+    request.onsuccess = function () {
+        var trans = request.result;
+        evalAndLog("db.createObjectStore('null')");
+        evalAndLog("db.createObjectStore('undefined')");
+        trans.oncomplete = verifyDegenerateNames;
+    };
+    function verifyDegenerateNames() {
+        shouldNotThrow("transaction = db.transaction(null)");
+        shouldBeNonNull("transaction.objectStore('null')");
+        shouldNotThrow("transaction = db.transaction(undefined)");
+        shouldBeNonNull("transaction.objectStore('undefined')");
+        finishJSTest();
+    }
 }
 

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

@@ -203 +203 @@
 PASS code is IDBDatabaseException.TYPE_ERR
 PASS ename is 'TypeError'
+
+Test that null and undefined are treated as strings
+Expecting exception from db.transaction(null)
+PASS Exception was thrown.
+PASS code is DOMException.NOT_FOUND_ERR
+PASS ename is 'NotFoundError'
+Expecting exception from db.transaction(undefined)
+PASS Exception was thrown.
+PASS code is DOMException.NOT_FOUND_ERR
+PASS ename is 'NotFoundError'
+db.setVersion('funny names')
+db.createObjectStore('null')
+db.createObjectStore('undefined')
+PASS transaction = db.transaction(null) did not throw exception.
+PASS transaction.objectStore('null') is non-null.
+PASS transaction = db.transaction(undefined) did not throw exception.
+PASS transaction.objectStore('undefined') is non-null.
 PASS successfullyParsed is true
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-09  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: A null or undefined storeNames argument to IDBDatabase::transaction() should be coerced to string
+        https://bugs.webkit.org/show_bug.cgi?id=90474
+
+        Reviewed by Tony Chang.
+
+        Test: storage/indexeddb/transaction-basics.html
+
+        * Modules/indexeddb/IDBDatabase.cpp:
+        (WebCore::IDBDatabase::transaction):
+        * Modules/indexeddb/IDBDatabase.idl:
+
 2012-07-09  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp

@@ -208 +208 @@
 {
     RefPtr<DOMStringList> storeNames = prpStoreNames;
-    if (!storeNames || storeNames->isEmpty()) {
+    ASSERT(storeNames.get());
+    if (storeNames->isEmpty()) {
         ec = IDBDatabaseException::IDB_INVALID_ACCESS_ERR;
         return 0;

trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.idl

@@ -46 +46 @@
         [CallWith=ScriptExecutionContext] IDBVersionChangeRequest setVersion(in DOMString version)
             raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList? storeNames, in [Optional=DefaultIsNullString] DOMString mode)
+        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList storeNames, in [Optional=DefaultIsNullString] DOMString mode)
             raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[]? storeNames, in [Optional=DefaultIsNullString] DOMString mode)
+        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[] storeNames, in [Optional=DefaultIsNullString] DOMString mode)
             raises (IDBDatabaseException);
         [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString storeName, in [Optional=DefaultIsNullString] DOMString mode)
@@ -54 +54 @@
 
         // FIXME: remove these when https://bugs.webkit.org/show_bug.cgi?id=85326 is fixed.
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList? storeNames, in unsigned short mode)
+        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList storeNames, in unsigned short mode)
             raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[]? storeNames, in unsigned short mode)
+        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[] storeNames, in unsigned short mode)
             raises (IDBDatabaseException);
         [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString storeName, in unsigned short mode)