Changeset 85088 in webkit

Timestamp:

Apr 27, 2011 2:05:20 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-27 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

Hang if a sync message handler invalidates the connection
​https://bugs.webkit.org/show_bug.cgi?id=59627

If dispatching incoming messages while waiting for the sync reply caused the connection to be invalidated,
we need to return early or we'll wait forever.

• Platform/CoreIPC/Connection.cpp: (CoreIPC::Connection::waitForSyncReply):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Hang if a sync message handler invalidates the connection
+        https://bugs.webkit.org/show_bug.cgi?id=59627
+
+        If dispatching incoming messages while waiting for the sync reply caused the connection to be invalidated,
+        we need to return early or we'll wait forever.
+
+        * Platform/CoreIPC/Connection.cpp:
+        (CoreIPC::Connection::waitForSyncReply):
+
 2011-04-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

@@ -436 +436 @@
         }
 
+        // Processing a sync message could cause the connection to be invalidated.
+        // (If the handler ends up calling Connection::invalidate).
+        // If that happens, we need to stop waiting, or we'll hang since we won't get
+        // any more incoming messages.
+        if (!isValid())
+            return 0;
+
         // We didn't find a sync reply yet, keep waiting.
 #if PLATFORM(WIN)