Title: [257459] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 257459
- Author
- [email protected]
- Date
- 2020-02-26 02:58:23 -0800 (Wed, 26 Feb 2020)
Log Message
Merge r257361 - Assertion failed: currentSchema == createV1ObjectStoreInfoSchema(objectStoreInfoTableName) || currentSchema == createV1ObjectStoreInfoSchema(objectStoreInfoTableNameAlternate)
https://bugs.webkit.org/show_bug.cgi?id=208144
Reviewed by Ryosuke Niwa.
Change a release assertion to release error log to gather information about bug. This is also the pattern of
handling error during schema update in SQLiteIDBBackingStore.
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::ensureValidObjectStoreInfoTable):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (257458 => 257459)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-26 10:58:20 UTC (rev 257458)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-26 10:58:23 UTC (rev 257459)
@@ -1,3 +1,16 @@
+2020-02-25 Sihui Liu <[email protected]>
+
+ Assertion failed: currentSchema == createV1ObjectStoreInfoSchema(objectStoreInfoTableName) || currentSchema == createV1ObjectStoreInfoSchema(objectStoreInfoTableNameAlternate)
+ https://bugs.webkit.org/show_bug.cgi?id=208144
+
+ Reviewed by Ryosuke Niwa.
+
+ Change a release assertion to release error log to gather information about bug. This is also the pattern of
+ handling error during schema update in SQLiteIDBBackingStore.
+
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::ensureValidObjectStoreInfoTable):
+
2020-02-24 ChangSeok Oh <[email protected]>
PS-2019-006: [GTK] WebKit - AXObjectCache - m_deferredFocusedNodeChange - UaF
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (257458 => 257459)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2020-02-26 10:58:20 UTC (rev 257458)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2020-02-26 10:58:23 UTC (rev 257459)
@@ -689,7 +689,10 @@
if (currentSchema == v2ObjectStoreInfoSchema || currentSchema == createV2ObjectStoreInfoSchema(objectStoreInfoTableNameAlternate))
return { IsSchemaUpgraded::No };
- RELEASE_ASSERT(currentSchema == createV1ObjectStoreInfoSchema(objectStoreInfoTableName) || currentSchema == createV1ObjectStoreInfoSchema(objectStoreInfoTableNameAlternate));
+ if (currentSchema != createV1ObjectStoreInfoSchema(objectStoreInfoTableName) && currentSchema != createV1ObjectStoreInfoSchema(objectStoreInfoTableNameAlternate)) {
+ RELEASE_LOG_ERROR(IndexedDB, "%p - SQLiteIDBBackingStore::ensureValidObjectStoreInfoTable: schema is invalid - %s", this, currentSchema.utf8().data());
+ return WTF::nullopt;
+ }
// Drop column maxIndexID from table.
SQLiteTransaction transaction(*m_sqliteDB);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
