[webkit-changes] [187323] branches/safari-601.1-branch

Fri, 24 Jul 2015 00:54:58 -0700

Title: [187323] branches/safari-601.1-branch

Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187322 => 187323)


--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-07-24 07:54:37 UTC (rev 187322)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-07-24 07:54:40 UTC (rev 187323)
@@ -1,5 +1,19 @@
 2015-07-24  Matthew Hanson  <[email protected]>
 
+        Merge r187248. rdar://problem/21949735
+
+    2015-07-23  Brady Eidson  <[email protected]>
+
+            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  <[email protected]>
+
         Merge r187189. rdar://problem/21567767
 
     2015-07-22  Dean Jackson  <[email protected]>

Added: branches/safari-601.1-branch/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt (0 => 187323)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt	                        (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher-expected.txt	2015-07-24 07:54:40 UTC (rev 187323)
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: Refused to load the font 'http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff' because it violates the following Content Security Policy directive: "font-src http://webkit.org".
+
+CONSOLE MESSAGE: Refused to load the font 'http://127.0.0.1:8000/security/contentSecurityPolicy/example_font.woff' because it violates the following Content Security Policy directive: "font-src http://webkit.org".
+
+The iframe below triggers a violation report creating the initial empty document. It should not crash the web process.
+

Added: branches/safari-601.1-branch/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher.html (0 => 187323)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher.html	                        (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/contentSecurityPolicy/user-style-sheet-font-crasher.html	2015-07-24 07:54:40 UTC (rev 187323)
@@ -0,0 +1,16 @@
+<html>
+<head>
+<meta content="font-src http://webkit.org; report-uri http://webkit.org/report;" http-equiv="Content-Security-Policy">
+<script>
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
+    testRunner.addUserStyleSheet("@font-face { font-family: ExampleFont; src: url(example_font.woff); }", true);
+}
+</script>
+</head>
+<body>
+The iframe below triggers a violation report creating the initial empty document. It should not crash the web process.<br>
+<iframe src=""
+</body>
+</html>

Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187322 => 187323)


--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog	2015-07-24 07:54:37 UTC (rev 187322)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog	2015-07-24 07:54:40 UTC (rev 187323)
@@ -1,5 +1,19 @@
 2015-07-24  Matthew Hanson  <[email protected]>
 
+        Merge r187248. rdar://problem/21949735
+
+    2015-07-23  Brady Eidson  <[email protected]>
+
+            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  <[email protected]>
+
         Merge r187215. rdar://problem/21032083
 
     2015-07-22  James Savage  <[email protected]>

Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (187322 => 187323)


--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp	2015-07-24 07:54:37 UTC (rev 187322)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp	2015-07-24 07:54:40 UTC (rev 187323)
@@ -251,6 +251,11 @@
 
 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()) {
         LoaderStrategy::createPingHandle(networkingContext, request, shouldUseCredentialStorage);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to