Changeset 140852 in webkit

Timestamp:

Jan 25, 2013, 11:45:10 AM (13 years ago)

Author:

beidson@apple.com

Message:

New NetworkProcess can ASSERT after old NetworkProcess crashes
​https://bugs.webkit.org/show_bug.cgi?id=107970

Reviewed by Alexey Proskuryakov.

• NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::removeLoadIdentifier): Don't tell the scheduler

to remove a loader that doesn't exist, as we might be recovering from a crash.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkConnectionToWebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-25  Brady Eidson  <beidson@apple.com>
+
+        New NetworkProcess can ASSERT after old NetworkProcess crashes
+        https://bugs.webkit.org/show_bug.cgi?id=107970
+
+        Reviewed by Alexey Proskuryakov.
+
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::removeLoadIdentifier): Don't tell the scheduler
+          to remove a loader that doesn't exist, as we might be recovering from a crash.
+
 2013-01-25  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

@@ -125 +125 @@
         loader = m_syncNetworkResourceLoaders.take(identifier);
 
+    // It's possible we have no loader for this identifier if the NetworkProcess crashed and this was a respawned NetworkProcess.
+    if (!loader)
+        return;
+
     NetworkProcess::shared().networkResourceLoadScheduler().removeLoader(loader.get());
 }