Title: [209132] trunk/Source/WebCore
Revision
209132
Author
[email protected]
Date
2016-11-30 09:38:00 -0800 (Wed, 30 Nov 2016)

Log Message

REGRESSION (209086): IDB tests crash under GuardMalloc.
https://bugs.webkit.org/show_bug.cgi?id=165201

Reviewed by Chris Dumez.

No new tests (Covered by literally every IDB test when run under GuardMalloc).

* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::commitOnServer): "Commit on Server" operations are special, in that they
  are the last operation a transaction does, and they remove themselves from the protector map right away.
  So when we remove them from the protector map we also need to remove their raw-pointer from the
  "in-progress" queue.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209131 => 209132)


--- trunk/Source/WebCore/ChangeLog	2016-11-30 17:10:04 UTC (rev 209131)
+++ trunk/Source/WebCore/ChangeLog	2016-11-30 17:38:00 UTC (rev 209132)
@@ -1,3 +1,18 @@
+2016-11-30  Brady Eidson  <[email protected]>
+
+        REGRESSION (209086): IDB tests crash under GuardMalloc.
+        https://bugs.webkit.org/show_bug.cgi?id=165201
+
+        Reviewed by Chris Dumez.
+
+        No new tests (Covered by literally every IDB test when run under GuardMalloc).
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::commitOnServer): "Commit on Server" operations are special, in that they
+          are the last operation a transaction does, and they remove themselves from the protector map right away.
+          So when we remove them from the protector map we also need to remove their raw-pointer from the 
+          "in-progress" queue.
+
 2016-11-30  Said Abou-Hallawa  <[email protected]>
 
         Some animated image do not animate after reseting their animations

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (209131 => 209132)


--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp	2016-11-30 17:10:04 UTC (rev 209131)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp	2016-11-30 17:38:00 UTC (rev 209132)
@@ -506,6 +506,10 @@
 
     m_database->connectionProxy().commitTransaction(*this);
 
+    ASSERT(!m_transactionOperationsInProgressQueue.isEmpty());
+    ASSERT(m_transactionOperationsInProgressQueue.last() == &operation);
+    m_transactionOperationsInProgressQueue.removeLast();
+
     ASSERT(m_transactionOperationMap.contains(operation.identifier()));
     m_transactionOperationMap.remove(operation.identifier());
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to