Attachment 346881 Details for Bug 188461 – Patch

[patch] Patch

bug-188461-20180809174930.patch (text/plain), 1.81 KB, created by Sihui Liu on 2018-08-09 17:49:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2018-08-09 17:49:31 PDT

Size: 1.81 KB

patch

obsolete

>Subversion Revision: 234742
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 994a0560fbed876db99b3c2467c2feac27e8ba24..492fbc501a87c7af61f2ffe461ff059533d36e49 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-09  Sihui Liu  <sihui_liu@apple.com>
>+
>+        CrashTracer: com.apple.WebKit.Storage at WebCore::IDBServer::UniqueIDBDatabase::scheduleShutdownForClose
>+        https://bugs.webkit.org/show_bug.cgi?id=188461
>+        <rdar://problem/33555052>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Before we try to schedule shutdown for database in operationAndTransactionTimerFired, we 
>+        should check m_owningPointerForClose to see there is already a shutdown running.
>+        When the timer is invoked multiple times, operationAndTransactionTimerFired may be called 
>+        consecutively on the same thread.
>+
>+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
>+        (WebCore::IDBServer::UniqueIDBDatabase::operationAndTransactionTimerFired):
>+
> 2018-08-09  Saam Barati  <sbarati@apple.com>
> 
>         memoryFootprint should return size_t not optional<size_t>
>diff --git a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
>index 28da2a566252a1118d2f42864b8267f9c23f3af5..b72e8b1a399f9eea76d94032c8155fa27adad9ca 100644
>--- a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
>+++ b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
>@@ -1550,7 +1550,8 @@ void UniqueIDBDatabase::operationAndTransactionTimerFired()
>         ASSERT(m_pendingTransactions.isEmpty());
>         ASSERT(!hasUnfinishedTransactions());
> 
>-        scheduleShutdownForClose();
>+        if (!m_owningPointerForClose)
>+            scheduleShutdownForClose();
>         return;
>     }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188461: 346881 | 346909 | 346910