Title: [259603] branches/safari-609-branch/Source/WebCore
- Revision
- 259603
- Author
- [email protected]
- Date
- 2020-04-06 16:05:21 -0700 (Mon, 06 Apr 2020)
Log 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
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (259602 => 259603)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-04-06 23:05:18 UTC (rev 259602)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-04-06 23:05:21 UTC (rev 259603)
@@ -1,5 +1,38 @@
2020-04-06 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r259315. rdar://problem/61352448
Regression(r253357) DeviceMotionEvent acceleration and rotationRate are null
Modified: branches/safari-609-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (259602 => 259603)
--- branches/safari-609-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2020-04-06 23:05:18 UTC (rev 259602)
+++ branches/safari-609-branch/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2020-04-06 23:05:21 UTC (rev 259603)
@@ -1885,6 +1885,10 @@
if (!transaction || !transaction->inProgress())
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())
key = IDBKeyData::minimum();
@@ -2003,9 +2007,7 @@
if (!error.isNull())
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 { };
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
