Changeset 243903 in webkit

Timestamp:

Apr 4, 2019, 1:53:22 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

Leak of UniqueIDBDatabase in network process running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=196565
<rdar://problem/49346139>

Reviewed by Geoffrey Garen.

UniqueIDBDatabase will null itself after it receives confirmation about connecton close from its clients, but it
is possible that the web process to network process connection closes before servers gets the
confirmDidCloseFromServer. Therefore, we should let UniqueIDBDatabase forget connection when it receives a
conenctionClosedFromClient.

No new test because this bug is caused by race between network receiving conenctionClosedFromClient and
receiving confirmDidCloseFromServer. This is testable by running some existing layout tests in a row with leak
option.

• Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
(WebCore::IDBServer::UniqueIDBDatabase::confirmDidCloseFromServer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-04  Sihui Liu  <sihui_liu@apple.com>
+
+        Leak of UniqueIDBDatabase in network process running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=196565
+        <rdar://problem/49346139>
+
+        Reviewed by Geoffrey Garen.
+
+        UniqueIDBDatabase will null itself after it receives confirmation about connecton close from its clients, but it
+        is possible that the web process to network process connection closes before servers gets the 
+        confirmDidCloseFromServer. Therefore, we should let UniqueIDBDatabase forget connection when it receives a 
+        conenctionClosedFromClient.
+
+        No new test because this bug is caused by race between network receiving conenctionClosedFromClient and 
+        receiving confirmDidCloseFromServer. This is testable by running some existing layout tests in a row with leak 
+        option.
+
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::connectionClosedFromClient):
+        (WebCore::IDBServer::UniqueIDBDatabase::confirmDidCloseFromServer):
+
 2019-04-04  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

@@ -1734 +1734 @@
     LOG(IndexedDB, "(main) UniqueIDBDatabase::connectionClosedFromClient - %s (%" PRIu64 ")", connection.openRequestIdentifier().loggingString().utf8().data(), connection.identifier());
 
+    if (m_serverClosePendingDatabaseConnections.contains(&connection)) {
+        m_serverClosePendingDatabaseConnections.remove(&connection);
+        if (m_hardClosedForUserDelete)
+            maybeFinishHardClose();
+        return;
+    }
+
     Ref<UniqueIDBDatabaseConnection> protectedConnection(connection);
     m_openDatabaseConnections.remove(&connection);
@@ -1813 +1820 @@
     LOG(IndexedDB, "UniqueIDBDatabase::confirmDidCloseFromServer - %s (%" PRIu64 ")", connection.openRequestIdentifier().loggingString().utf8().data(), connection.identifier());
 
+    if (!m_serverClosePendingDatabaseConnections.contains(&connection))
+        return;
+    m_serverClosePendingDatabaseConnections.remove(&connection);
+
     if (m_hardClosedForUserDelete)
         maybeFinishHardClose();
-    ASSERT(m_serverClosePendingDatabaseConnections.contains(&connection));
-    m_serverClosePendingDatabaseConnections.remove(&connection);
 }