<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190960] releases/WebKitGTK/webkit-2.10</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190960">190960</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-13 03:54:35 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190588">r190588</a> - Fix null pointer dereference in WebSocket::connect()
https://bugs.webkit.org/show_bug.cgi?id=149311
<rdar://problem/22748858>
Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-05
Reviewed by Chris Dumez.
Source/WebCore:
This is a merge of Blink <a href="http://trac.webkit.org/projects/webkit/changeset/187441">r187441</a>,
https://codereview.chromium.org/785933005
Test: http/tests/websocket/construct-in-detached-frame.html
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::connect):
Call function implemented below instead of duplicating the code.
* page/ContentSecurityPolicy.cpp:
(WebCore::ContentSecurityPolicy::shouldBypassMainWorldContentSecurityPolicy):
* page/ContentSecurityPolicy.h:
Factor the logic to check shouldBypassMainWorldContentSecurityPolicy into
a function in this class. Check Frame pointers are not null before getting
shouldBypassMainWorldContentSecurityPolicy via those pointers.
* page/EventSource.cpp:
(WebCore::EventSource::create):
This got fixed as a bonus.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::open):
This got fixed as a bonus too.
LayoutTests:
* http/tests/websocket/construct-in-detached-frame-expected.txt: Added.
* http/tests/websocket/construct-in-detached-frame.html: Added.
* http/tests/websocket/resources/construct-in-detached-frame.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreModuleswebsocketsWebSocketcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageContentSecurityPolicycpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageContentSecurityPolicyh">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorepageEventSourcecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorexmlXMLHttpRequestcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestswebsocketconstructindetachedframeexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestswebsocketconstructindetachedframehtml">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestswebsocketresourcesconstructindetachedframehtml">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/resources/construct-in-detached-frame.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-10-05 Jiewen Tan <jiewen_tan@apple.com>
+
+ Fix null pointer dereference in WebSocket::connect()
+ https://bugs.webkit.org/show_bug.cgi?id=149311
+ <rdar://problem/22748858>
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/websocket/construct-in-detached-frame-expected.txt: Added.
+ * http/tests/websocket/construct-in-detached-frame.html: Added.
+ * http/tests/websocket/resources/construct-in-detached-frame.html: Added.
+
</ins><span class="cx"> 2015-10-02 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> ShadowRoot with leading or trailing white space cause a crash
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestshttptestswebsocketconstructindetachedframeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame-expected.txt (0 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame-expected.txt 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Construct a WebSocket in a detached frame. The test passes if there is no crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestshttptestswebsocketconstructindetachedframehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame.html (0 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/construct-in-detached-frame.html 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<script src="../resources/js-test-pre.js"></script>
+<script>
+ description('Construct a WebSocket in a detached frame. The test passes if there is no crash.');
+
+ window.jsTestIsAsync = true;
+
+ function detachIframe()
+ {
+ var testIframe = document.getElementById('testIframe');
+ testIframe.parentNode.remove(testIframe);
+ }
+
+ function done()
+ {
+ finishJSTest();
+ }
+</script>
+<iframe src="resources/construct-in-detached-frame.html" id="testIframe"></iframe>
+<script src="../resources/js-test-post.js"></script>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestshttptestswebsocketresourcesconstructindetachedframehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/resources/construct-in-detached-frame.html (0 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/resources/construct-in-detached-frame.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/websocket/resources/construct-in-detached-frame.html 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<script>
+var parentWindow = parent;
+var webSocketClass = WebSocket;
+
+parentWindow.detachIframe();
+try {
+ new webSocketClass('ws://127.0.0.1/');
+} catch (e) {
+ parentWindow.console.log(e.message);
+}
+parentWindow.done();
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-05 Jiewen Tan <jiewen_tan@apple.com>
+
+ Fix null pointer dereference in WebSocket::connect()
+ https://bugs.webkit.org/show_bug.cgi?id=149311
+ <rdar://problem/22748858>
+
+ Reviewed by Chris Dumez.
+
+ This is a merge of Blink r187441,
+ https://codereview.chromium.org/785933005
+
+ Test: http/tests/websocket/construct-in-detached-frame.html
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::connect):
+ Call function implemented below instead of duplicating the code.
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::ContentSecurityPolicy::shouldBypassMainWorldContentSecurityPolicy):
+ * page/ContentSecurityPolicy.h:
+ Factor the logic to check shouldBypassMainWorldContentSecurityPolicy into
+ a function in this class. Check Frame pointers are not null before getting
+ shouldBypassMainWorldContentSecurityPolicy via those pointers.
+ * page/EventSource.cpp:
+ (WebCore::EventSource::create):
+ This got fixed as a bonus.
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::open):
+ This got fixed as a bonus too.
+
</ins><span class="cx"> 2015-10-02 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> ShadowRoot with leading or trailing white space cause a crash
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/Modules/websockets/WebSocket.cpp (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -239,11 +239,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Convert this to check the isolated world's Content Security Policy once webkit.org/b/104520 is solved.
</span><del>- bool shouldBypassMainWorldContentSecurityPolicy = false;
- if (is<Document>(*scriptExecutionContext())) {
- Document& document = downcast<Document>(*scriptExecutionContext());
- shouldBypassMainWorldContentSecurityPolicy = document.frame()->script().shouldBypassMainWorldContentSecurityPolicy();
- }
</del><ins>+ bool shouldBypassMainWorldContentSecurityPolicy = ContentSecurityPolicy::shouldBypassMainWorldContentSecurityPolicy(*scriptExecutionContext());
</ins><span class="cx"> if (!scriptExecutionContext()->contentSecurityPolicy()->allowConnectToSource(m_url, shouldBypassMainWorldContentSecurityPolicy)) {
</span><span class="cx"> m_state = CLOSED;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.cpp (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.cpp 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.cpp 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "PingLoader.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "SchemeRegistry.h"
</span><ins>+#include "ScriptController.h"
</ins><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityPolicyViolationEvent.h"
</span><span class="lines">@@ -1780,4 +1781,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ContentSecurityPolicy::shouldBypassMainWorldContentSecurityPolicy(ScriptExecutionContext& context)
+{
+ if (is<Document>(context)) {
+ auto& document = downcast<Document>(context);
+ return document.frame() && document.frame()->script().shouldBypassMainWorldContentSecurityPolicy();
+ }
+
+ return false;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepageContentSecurityPolicyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.h (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.h 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/ContentSecurityPolicy.h 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> String evalDisabledErrorMessage() const;
</span><span class="cx">
</span><span class="cx"> bool experimentalFeaturesEnabled() const;
</span><ins>+ static bool shouldBypassMainWorldContentSecurityPolicy(ScriptExecutionContext&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void logToConsole(const String& message, const String& contextURL = String(), const WTF::OrdinalNumber& contextLine = WTF::OrdinalNumber::beforeFirst(), JSC::ExecState* = nullptr) const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventSource.cpp (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventSource.cpp 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/EventSource.cpp 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -86,11 +86,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Convert this to check the isolated world's Content Security Policy once webkit.org/b/104520 is solved.
</span><del>- bool shouldBypassMainWorldContentSecurityPolicy = false;
- if (is<Document>(context)) {
- Document& document = downcast<Document>(context);
- shouldBypassMainWorldContentSecurityPolicy = document.frame()->script().shouldBypassMainWorldContentSecurityPolicy();
- }
</del><ins>+ bool shouldBypassMainWorldContentSecurityPolicy = ContentSecurityPolicy::shouldBypassMainWorldContentSecurityPolicy(context);
</ins><span class="cx"> if (!context.contentSecurityPolicy()->allowConnectToSource(fullURL, shouldBypassMainWorldContentSecurityPolicy)) {
</span><span class="cx"> // FIXME: Should this be throwing an exception?
</span><span class="cx"> ec = SECURITY_ERR;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp (190959 => 190960)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp 2015-10-13 10:53:47 UTC (rev 190959)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/xml/XMLHttpRequest.cpp 2015-10-13 10:54:35 UTC (rev 190960)
</span><span class="lines">@@ -504,12 +504,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Convert this to check the isolated world's Content Security Policy once webkit.org/b/104520 is solved.
</span><del>- bool shouldBypassMainWorldContentSecurityPolicy = false;
- if (is<Document>(*scriptExecutionContext())) {
- Document& document = downcast<Document>(*scriptExecutionContext());
- if (document.frame())
- shouldBypassMainWorldContentSecurityPolicy = document.frame()->script().shouldBypassMainWorldContentSecurityPolicy();
- }
</del><ins>+ bool shouldBypassMainWorldContentSecurityPolicy = ContentSecurityPolicy::shouldBypassMainWorldContentSecurityPolicy(*scriptExecutionContext());
</ins><span class="cx"> if (!scriptExecutionContext()->contentSecurityPolicy()->allowConnectToSource(url, shouldBypassMainWorldContentSecurityPolicy)) {
</span><span class="cx"> // FIXME: Should this be throwing an exception?
</span><span class="cx"> ec = SECURITY_ERR;
</span></span></pre>
</div>
</div>
</body>
</html>