Changeset 85238 in webkit

Timestamp:

Apr 28, 2011 2:12:45 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Tony Chang.

IndexedDB createIndex should fail if name arg is null
​https://bugs.webkit.org/show_bug.cgi?id=58365

• storage/indexeddb/mozilla/create-index-null-name-expected.txt: Added.
• storage/indexeddb/mozilla/create-index-null-name.html: Added.

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

Reviewed by Tony Chang.

IndexedDB createIndex should fail if name arg is null
​https://bugs.webkit.org/show_bug.cgi?id=58365

Test: storage/indexeddb/mozilla/create-index-null-name.html

• storage/IDBObjectStore.idl:
• storage/IDBObjectStoreBackendImpl.cpp: (WebCore::IDBObjectStoreBackendImpl::createIndex):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/mozilla/create-index-null-name-expected.txt (added)
• LayoutTests/storage/indexeddb/mozilla/create-index-null-name.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBObjectStore.idl (modified) (2 diffs)
• 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 createIndex should fail if name arg is null
+        https://bugs.webkit.org/show_bug.cgi?id=58365
+
+        * storage/indexeddb/mozilla/create-index-null-name-expected.txt: Added.
+        * storage/indexeddb/mozilla/create-index-null-name.html: Added.
+
 2011-04-28  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-28  Mark Pilgrim  <pilgrim@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        IndexedDB createIndex should fail if name arg is null
+        https://bugs.webkit.org/show_bug.cgi?id=58365
+
+        Test: storage/indexeddb/mozilla/create-index-null-name.html
+
+        * storage/IDBObjectStore.idl:
+        * storage/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::createIndex):
+
 2011-04-28  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebCore/storage/IDBObjectStore.idl

@@ -29 +29 @@
         Conditional=INDEXED_DATABASE
     ] IDBObjectStore {
-        readonly attribute DOMString name;
+        readonly attribute [ConvertNullStringTo=Null] DOMString name;
         readonly attribute [ConvertNullStringTo=Null] DOMString keyPath;
         readonly attribute DOMStringList indexNames;
@@ -45 +45 @@
         [CallWith=ScriptExecutionContext] IDBRequest openCursor(in [Optional] IDBKeyRange range, in [Optional] unsigned short direction)
             raises (IDBDatabaseException);
-        IDBIndex createIndex(in DOMString name, in [ConvertNullToNullString] DOMString keyPath, in [Optional] OptionsObject options)
+        IDBIndex createIndex(in [ConvertNullToNullString] DOMString name, in [ConvertNullToNullString] DOMString keyPath, in [Optional] OptionsObject options)
             raises (IDBDatabaseException);
         IDBIndex index(in DOMString name)

trunk/Source/WebCore/storage/IDBObjectStoreBackendImpl.cpp

@@ -376 +376 @@
 PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendImpl::createIndex(const String& name, const String& keyPath, bool unique, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
 {
+    if (name.isNull()) {
+        ec = IDBDatabaseException::NON_TRANSIENT_ERR;
+        return 0;
+    }
     if (m_indexes.contains(name)) {
         ec = IDBDatabaseException::CONSTRAINT_ERR;