<!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>[182923] trunk/Source/WebCore</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/182923">182923</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-16 16:41:27 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add assertions to make sure ActiveDOMObject::suspend() / resume() / stop() overrides don't fire events
https://bugs.webkit.org/show_bug.cgi?id=143850
Reviewed by Alexey Proskuryakov.
Add assertions to make sure ActiveDOMObject::suspend() / resume() / stop()
overrides don't fire events as this is not allowed. This would cause
arbitrary JS execution which would be very dangerous in these stages.
Firing JS events from these functions is a common source of crashes.
* Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::suspend):
(WebCore::WebSocket::resume):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::suspendActiveDOMObjects):
(WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
(WebCore::ScriptExecutionContext::stopActiveDOMObjects):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::suspend):
(WebCore::XMLHttpRequest::resume):
(WebCore::XMLHttpRequest::stop):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketcpp">trunk/Source/WebCore/Modules/websockets/WebSocket.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182922 => 182923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-16 23:41:22 UTC (rev 182922)
+++ trunk/Source/WebCore/ChangeLog 2015-04-16 23:41:27 UTC (rev 182923)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-04-16 Chris Dumez <cdumez@apple.com>
+
+ Add assertions to make sure ActiveDOMObject::suspend() / resume() / stop() overrides don't fire events
+ https://bugs.webkit.org/show_bug.cgi?id=143850
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add assertions to make sure ActiveDOMObject::suspend() / resume() / stop()
+ overrides don't fire events as this is not allowed. This would cause
+ arbitrary JS execution which would be very dangerous in these stages.
+
+ Firing JS events from these functions is a common source of crashes.
+
+ * Modules/websockets/WebSocket.cpp:
+ (WebCore::WebSocket::suspend):
+ (WebCore::WebSocket::resume):
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::suspendActiveDOMObjects):
+ (WebCore::ScriptExecutionContext::resumeActiveDOMObjects):
+ (WebCore::ScriptExecutionContext::stopActiveDOMObjects):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::suspend):
+ (WebCore::XMLHttpRequest::resume):
+ (WebCore::XMLHttpRequest::stop):
+
</ins><span class="cx"> 2015-04-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Media element can manipulate DOM during Document destruction.
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (182922 => 182923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-04-16 23:41:22 UTC (rev 182922)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2015-04-16 23:41:27 UTC (rev 182923)
</span><span class="lines">@@ -468,8 +468,6 @@
</span><span class="cx">
</span><span class="cx"> void WebSocket::suspend(ReasonForSuspension reason)
</span><span class="cx"> {
</span><del>- NoEventDispatchAssertion assertNoEventDispatch;
-
</del><span class="cx"> if (m_resumeTimer.isActive())
</span><span class="cx"> m_resumeTimer.stop();
</span><span class="cx">
</span><span class="lines">@@ -486,8 +484,6 @@
</span><span class="cx">
</span><span class="cx"> void WebSocket::resume()
</span><span class="cx"> {
</span><del>- NoEventDispatchAssertion assertNoEventDispatch;
-
</del><span class="cx"> if (m_channel)
</span><span class="cx"> m_channel->resume();
</span><span class="cx"> else if (!m_pendingEvents.isEmpty() && !m_resumeTimer.isActive()) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (182922 => 182923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-04-16 23:41:22 UTC (rev 182922)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-04-16 23:41:27 UTC (rev 182923)
</span><span class="lines">@@ -227,6 +227,7 @@
</span><span class="cx"> // functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><span class="cx"> // An ASSERT or RELEASE_ASSERT will fire if this happens, but it's important to code
</span><span class="cx"> // suspend functions so it will not happen!
</span><ins>+ NoEventDispatchAssertion assertNoEventDispatch;
</ins><span class="cx"> for (auto* activeDOMObject : m_activeDOMObjects)
</span><span class="cx"> activeDOMObject->suspend(why);
</span><span class="cx">
</span><span class="lines">@@ -256,6 +257,7 @@
</span><span class="cx"> // functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><span class="cx"> // An ASSERT or RELEASE_ASSERT will fire if this happens, but it's important to code
</span><span class="cx"> // resume functions so it will not happen!
</span><ins>+ NoEventDispatchAssertion assertNoEventDispatch;
</ins><span class="cx"> for (auto* activeDOMObject : m_activeDOMObjects)
</span><span class="cx"> activeDOMObject->resume();
</span><span class="cx">
</span><span class="lines">@@ -283,6 +285,7 @@
</span><span class="cx"> // stop functions should not add new active DOM objects, nor execute arbitrary JavaScript.
</span><span class="cx"> // A RELEASE_ASSERT will fire if this happens, but it's important to code stop functions
</span><span class="cx"> // so it will not happen!
</span><ins>+ NoEventDispatchAssertion assertNoEventDispatch;
</ins><span class="cx"> for (auto* activeDOMObject : possibleActiveDOMObjects) {
</span><span class="cx"> // Check if this object was deleted already. If so, just skip it.
</span><span class="cx"> // Calling contains on a possibly-already-deleted object is OK because we guarantee
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (182922 => 182923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-04-16 23:41:22 UTC (rev 182922)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-04-16 23:41:27 UTC (rev 182923)
</span><span class="lines">@@ -1265,8 +1265,6 @@
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::suspend(ReasonForSuspension reason)
</span><span class="cx"> {
</span><del>- NoEventDispatchAssertion assertNoEventDispatch;
-
</del><span class="cx"> m_progressEventThrottle.suspend();
</span><span class="cx">
</span><span class="cx"> if (m_resumeTimer.isActive()) {
</span><span class="lines">@@ -1287,8 +1285,6 @@
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::resume()
</span><span class="cx"> {
</span><del>- NoEventDispatchAssertion assertNoEventDispatch;
-
</del><span class="cx"> m_progressEventThrottle.resume();
</span><span class="cx">
</span><span class="cx"> // We are not allowed to execute arbitrary JS in resume() so dispatch
</span><span class="lines">@@ -1306,7 +1302,6 @@
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::stop()
</span><span class="cx"> {
</span><del>- NoEventDispatchAssertion assertNoEventDispatch;
</del><span class="cx"> internalAbort();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>