<!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>[188976] trunk/Source/JavaScriptCore</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/188976">188976</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-08-26 11:53:36 -0700 (Wed, 26 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/188965">r188965</a>): BackendDispatcher loses request ids when called re-entrantly
https://bugs.webkit.org/show_bug.cgi?id=148480
Reviewed by Joseph Pecoraro.
I added an assertion that m_currentRequestId is Nullopt when dispatch() is called, but this should
not hold if dispatching a backend command while debugger is paused. I will remove the assertion
and add proper scoping for all dispatch() branches.
No new tests, this wrong assert caused inspector/dom-debugger/node-removed.html to crash reliably.
* inspector/InspectorBackendDispatcher.cpp:
(Inspector::BackendDispatcher::dispatch): Cover each exit with an appropriate TemporaryChange scope.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188975 => 188976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-26 18:52:44 UTC (rev 188975)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-26 18:53:36 UTC (rev 188976)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-26 Brian Burg <bburg@apple.com>
+
+ Web Inspector: REGRESSION(r188965): BackendDispatcher loses request ids when called re-entrantly
+ https://bugs.webkit.org/show_bug.cgi?id=148480
+
+ Reviewed by Joseph Pecoraro.
+
+ I added an assertion that m_currentRequestId is Nullopt when dispatch() is called, but this should
+ not hold if dispatching a backend command while debugger is paused. I will remove the assertion
+ and add proper scoping for all dispatch() branches.
+
+ No new tests, this wrong assert caused inspector/dom-debugger/node-removed.html to crash reliably.
+
+ * inspector/InspectorBackendDispatcher.cpp:
+ (Inspector::BackendDispatcher::dispatch): Cover each exit with an appropriate TemporaryChange scope.
+
</ins><span class="cx"> 2015-08-26 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> Remove the unused *Executable::unlinkCalls() and CodeBlock::unlinkCalls()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (188975 => 188976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-08-26 18:52:44 UTC (rev 188975)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-08-26 18:53:36 UTC (rev 188976)
</span><span class="lines">@@ -86,72 +86,81 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_protocolErrors.size());
</span><span class="cx">
</span><del>- RefPtr<InspectorValue> parsedMessage;
- if (!InspectorValue::parseJSON(message, parsedMessage)) {
- reportProtocolError(ParseError, ASCIILiteral("Message must be in JSON format"));
- sendPendingErrors();
- return;
- }
-
</del><ins>+ long requestId = 0;
</ins><span class="cx"> RefPtr<InspectorObject> messageObject;
</span><del>- if (!parsedMessage->asObject(messageObject)) {
- reportProtocolError(InvalidRequest, ASCIILiteral("Message must be a JSONified object"));
- sendPendingErrors();
- return;
- }
</del><span class="cx">
</span><del>- RefPtr<InspectorValue> requestIdValue;
- if (!messageObject->getValue(ASCIILiteral("id"), requestIdValue)) {
- reportProtocolError(InvalidRequest, ASCIILiteral("'id' property was not found"));
- sendPendingErrors();
- return;
- }
</del><ins>+ {
+ // In case this is a re-entrant call from a nested run loop, we don't want to lose
+ // the outer request's id just because the inner request is bogus.
+ TemporaryChange<Optional<long>> scopedRequestId(m_currentRequestId, Nullopt);
</ins><span class="cx">
</span><del>- long requestId = 0;
- if (!requestIdValue->asInteger(requestId)) {
- reportProtocolError(InvalidRequest, ASCIILiteral("The type of 'id' property must be integer"));
- sendPendingErrors();
- return;
- }
</del><ins>+ RefPtr<InspectorValue> parsedMessage;
+ if (!InspectorValue::parseJSON(message, parsedMessage)) {
+ reportProtocolError(ParseError, ASCIILiteral("Message must be in JSON format"));
+ sendPendingErrors();
+ return;
+ }
</ins><span class="cx">
</span><del>- ASSERT(!m_currentRequestId);
- TemporaryChange<Optional<long>> scopedRequestId(m_currentRequestId, requestId);
</del><ins>+ if (!parsedMessage->asObject(messageObject)) {
+ reportProtocolError(InvalidRequest, ASCIILiteral("Message must be a JSONified object"));
+ sendPendingErrors();
+ return;
+ }
</ins><span class="cx">
</span><del>- RefPtr<InspectorValue> methodValue;
- if (!messageObject->getValue(ASCIILiteral("method"), methodValue)) {
- reportProtocolError(InvalidRequest, ASCIILiteral("'method' property wasn't found"));
- sendPendingErrors();
- return;
- }
</del><ins>+ RefPtr<InspectorValue> requestIdValue;
+ if (!messageObject->getValue(ASCIILiteral("id"), requestIdValue)) {
+ reportProtocolError(InvalidRequest, ASCIILiteral("'id' property was not found"));
+ sendPendingErrors();
+ return;
+ }
</ins><span class="cx">
</span><del>- String methodString;
- if (!methodValue->asString(methodString)) {
- reportProtocolError(InvalidRequest, ASCIILiteral("The type of 'method' property must be string"));
- sendPendingErrors();
- return;
</del><ins>+ if (!requestIdValue->asInteger(requestId)) {
+ reportProtocolError(InvalidRequest, ASCIILiteral("The type of 'id' property must be integer"));
+ sendPendingErrors();
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<String> domainAndMethod;
- methodString.split('.', true, domainAndMethod);
- if (domainAndMethod.size() != 2 || !domainAndMethod[0].length() || !domainAndMethod[1].length()) {
- reportProtocolError(InvalidRequest, ASCIILiteral("The 'method' property was formatted incorrectly. It should be 'Domain.method'"));
- sendPendingErrors();
- return;
- }
</del><ins>+ {
+ // We could be called re-entrantly from a nested run loop, so restore the previous id.
+ TemporaryChange<Optional<long>> scopedRequestId(m_currentRequestId, requestId);
</ins><span class="cx">
</span><del>- String domain = domainAndMethod[0];
- SupplementalBackendDispatcher* domainDispatcher = m_dispatchers.get(domain);
- if (!domainDispatcher) {
- reportProtocolError(MethodNotFound, "'" + domain + "' domain was not found");
- sendPendingErrors();
- return;
- }
</del><ins>+ RefPtr<InspectorValue> methodValue;
+ if (!messageObject->getValue(ASCIILiteral("method"), methodValue)) {
+ reportProtocolError(InvalidRequest, ASCIILiteral("'method' property wasn't found"));
+ sendPendingErrors();
+ return;
+ }
</ins><span class="cx">
</span><del>- String method = domainAndMethod[1];
- domainDispatcher->dispatch(requestId, method, messageObject.releaseNonNull());
</del><ins>+ String methodString;
+ if (!methodValue->asString(methodString)) {
+ reportProtocolError(InvalidRequest, ASCIILiteral("The type of 'method' property must be string"));
+ sendPendingErrors();
+ return;
+ }
</ins><span class="cx">
</span><del>- if (m_protocolErrors.size())
- sendPendingErrors();
</del><ins>+ Vector<String> domainAndMethod;
+ methodString.split('.', true, domainAndMethod);
+ if (domainAndMethod.size() != 2 || !domainAndMethod[0].length() || !domainAndMethod[1].length()) {
+ reportProtocolError(InvalidRequest, ASCIILiteral("The 'method' property was formatted incorrectly. It should be 'Domain.method'"));
+ sendPendingErrors();
+ return;
+ }
+
+ String domain = domainAndMethod[0];
+ SupplementalBackendDispatcher* domainDispatcher = m_dispatchers.get(domain);
+ if (!domainDispatcher) {
+ reportProtocolError(MethodNotFound, "'" + domain + "' domain was not found");
+ sendPendingErrors();
+ return;
+ }
+
+ String method = domainAndMethod[1];
+ domainDispatcher->dispatch(requestId, method, messageObject.releaseNonNull());
+
+ if (m_protocolErrors.size())
+ sendPendingErrors();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BackendDispatcher::sendResponse(long requestId, RefPtr<InspectorObject>&& result)
</span></span></pre>
</div>
</div>
</body>
</html>