Changeset 255615 in webkit

Timestamp:

Feb 3, 2020 4:31:02 PM (4 years ago)

Author:

sihui_liu@apple.com

Message:

Crash in WebCore::IDBServer::IDBServer::createIndex
​https://bugs.webkit.org/show_bug.cgi?id=207137
<rdar://problem/59096231>

Reviewed by Darin Adler.

Source/WebCore:

Export IDBIndexInfo::isolatedCopy so it can be used in WebKitLegacy framework code.

• Modules/indexeddb/shared/IDBIndexInfo.h:

Source/WebKitLegacy:

• Storage/InProcessIDBServer.cpp:

(InProcessIDBServer::createIndex): Create an isolated copy of IDBIndexInfo before passing it to IDB thread.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/indexeddb/shared/IDBIndexInfo.h (modified) (1 diff)
• WebKitLegacy/ChangeLog (modified) (1 diff)
• WebKitLegacy/Storage/InProcessIDBServer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-03  Sihui Liu  <sihui_liu@apple.com>
+
+        Crash in WebCore::IDBServer::IDBServer::createIndex
+        https://bugs.webkit.org/show_bug.cgi?id=207137
+        <rdar://problem/59096231>
+
+        Reviewed by Darin Adler.
+
+        Export IDBIndexInfo::isolatedCopy so it can be used in WebKitLegacy framework code.
+
+        * Modules/indexeddb/shared/IDBIndexInfo.h:
+
 2020-02-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.h

@@ -38 +38 @@
     IDBIndexInfo(uint64_t identifier, uint64_t objectStoreIdentifier, const String& name, IDBKeyPath&&, bool unique, bool multiEntry);
 
-    IDBIndexInfo isolatedCopy() const;
+    WEBCORE_EXPORT IDBIndexInfo isolatedCopy() const;
 
     uint64_t identifier() const { return m_identifier; }

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2020-02-03  Sihui Liu  <sihui_liu@apple.com>
+
+        Crash in WebCore::IDBServer::IDBServer::createIndex
+        https://bugs.webkit.org/show_bug.cgi?id=207137
+        <rdar://problem/59096231>
+
+        Reviewed by Darin Adler.
+
+        * Storage/InProcessIDBServer.cpp:
+        (InProcessIDBServer::createIndex): Create an isolated copy of IDBIndexInfo before passing it to IDB thread.
+
 2020-01-31  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKitLegacy/Storage/InProcessIDBServer.cpp

@@ -323 +323 @@
 void InProcessIDBServer::createIndex(const WebCore::IDBRequestData& requestData, const IDBIndexInfo& info)
 {
-    dispatchTask([this, protectedThis = makeRef(*this), requestData = requestData.isolatedCopy(), info] {
+    dispatchTask([this, protectedThis = makeRef(*this), requestData = requestData.isolatedCopy(), info = info.isolatedCopy()] {
         LockHolder locker(m_server->lock());
         m_server->createIndex(requestData, info);