Title: [140852] trunk/Source/WebKit2
- Revision
- 140852
- Author
- beid...@apple.com
- Date
- 2013-01-25 11:45:10 -0800 (Fri, 25 Jan 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (140851 => 140852)
--- trunk/Source/WebKit2/ChangeLog 2013-01-25 19:20:08 UTC (rev 140851)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-25 19:45:10 UTC (rev 140852)
@@ -1,3 +1,14 @@
+2013-01-25 Brady Eidson <beid...@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 <a...@apple.com>
Send sandbox extensions for local files to NetworkProcess
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (140851 => 140852)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2013-01-25 19:20:08 UTC (rev 140851)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2013-01-25 19:45:10 UTC (rev 140852)
@@ -124,6 +124,10 @@
if (!loader)
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());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
