Changeset 259519 in webkit

Timestamp:

Apr 3, 2020 3:55:59 PM (4 years ago)

Author:

sihui_liu@apple.com

Message:

ASSERTION FAILED: objectStoreInfo in SQLiteIDBBackingStore::getRecord
​https://bugs.webkit.org/show_bug.cgi?id=209976
<rdar://problem/55005363>

Reviewed by Geoffrey Garen.

Return error if objectStoreInfo is null in SQLiteIDBBackingStore::getRecord, because there is a possibility
SQLiteIDBBackingStore does not have requested objectStoreInfo.

• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:

(WebCore::IDBServer::SQLiteIDBBackingStore::getRecord):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-03  Sihui Liu  <sihui_liu@apple.com>
+
+        ASSERTION FAILED: objectStoreInfo in SQLiteIDBBackingStore::getRecord
+        https://bugs.webkit.org/show_bug.cgi?id=209976
+        <rdar://problem/55005363>
+
+        Reviewed by Geoffrey Garen.
+
+        Return error if objectStoreInfo is null in SQLiteIDBBackingStore::getRecord, because there is a possibility 
+        SQLiteIDBBackingStore does not have requested objectStoreInfo.
+
+        * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+        (WebCore::IDBServer::SQLiteIDBBackingStore::getRecord):
+
 2020-04-03  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -2061 +2061 @@
         return IDBError { UnknownError, "Attempt to get a record from database without an in-progress transaction"_s };
 
+    auto* objectStoreInfo = infoForObjectStore(objectStoreID);
+    if (!objectStoreInfo)
+        return IDBError { InvalidStateError, "Object store cannot be found in the backing store"_s };
+
     auto key = keyRange.lowerKey;
     if (key.isNull())
@@ -2179 +2183 @@
         return error;
 
-    auto* objectStoreInfo = infoForObjectStore(objectStoreID);
-    ASSERT(objectStoreInfo);
-    resultValue = { keyData, { valueResultBuffer, WTFMove(blobURLs), WTFMove(blobFilePaths) }, objectStoreInfo->keyPath()};
+    resultValue = { keyData, { valueResultBuffer, WTFMove(blobURLs), WTFMove(blobFilePaths) }, objectStoreInfo->keyPath() };
     return IDBError { };
 }