Changeset 259603 in webkit

Timestamp:

Apr 6, 2020, 4:05:21 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r259519. rdar://problem/61352446

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):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@259519 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/WebCore

Files:

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

branches/safari-609-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-06  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r259519. rdar://problem/61352446
+
+    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):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259519 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-06  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp

@@ -1886 +1886 @@
         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())
@@ -2004 +2008 @@
         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 { };
 }