Changeset 187323 in webkit

Timestamp:

Jul 24, 2015, 12:54:40 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187248. rdar://problem/21949735

Location:

branches/safari-601.1-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt (added)
• LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher.html (added)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (modified) (1 diff)

branches/safari-601.1-branch/LayoutTests/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187248. rdar://problem/21949735
+
+    2015-07-23  Brady Eidson  <beidson@apple.com>
+
+            Crash in WebPlatformStrategies::createPingHandle - Deref a null NetworkingContext.
+            <rdar://problem/21949735> and https://bugs.webkit.org/show_bug.cgi?id=147227
+
+            Reviewed by Alexey Proskuryakov.
+
+            * http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt: Added.
+            * http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher.html: Added.
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187248. rdar://problem/21949735
+
+    2015-07-23  Brady Eidson  <beidson@apple.com>
+
+            Crash in WebPlatformStrategies::createPingHandle - Deref a null NetworkingContext.
+            <rdar://problem/21949735> and https://bugs.webkit.org/show_bug.cgi?id=147227
+
+            Reviewed by Alexey Proskuryakov.
+
+            * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+            (WebKit::WebPlatformStrategies::createPingHandle): Skip it if there's a null NetworkingContext.
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

@@ -252 +252 @@
 void WebPlatformStrategies::createPingHandle(NetworkingContext* networkingContext, ResourceRequest& request, bool shouldUseCredentialStorage)
 {
+    // It's possible that call to createPingHandle might be made during initial empty Document creation before a NetworkingContext exists.
+    // It is not clear that we should send ping loads during that process anyways.
+    if (!networkingContext)
+        return;
+
     auto& webProcess = WebProcess::singleton();
     if (!webProcess.usesNetworkProcess()) {