[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [75157] trunk/WebCore
From: commit-queue () webkit ! org
Date: 2011-01-06 16:31:53
Message-ID: 20110106163153.E6FB6624ED2E () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[75157] trunk/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/75157">75157</a></dd> \
<dt>Author</dt> <dd>commit-queue@webkit.org</dd> <dt>Date</dt> <dd>2011-01-06 \
08:31:47 -0800 (Thu, 06 Jan 2011)</dd> </dl>
<h3>Log Message</h3>
<pre>2011-01-06 Jan Erik Hanssen <jhanssen@sencha.com>
Reviewed by Andreas Kling.
[Qt] crash in QNetworkReplyHandler::sendResponseIfNeeded()
https://bugs.webkit.org/show_bug.cgi?id=51453
Check if m_reply is NULL before accessing.
* manual-tests/load-deferrer-resume-crash.html: Added.
* platform/network/qt/QNetworkReplyHandler.cpp:
(WebCore::QNetworkReplyHandler::setLoadMode):
(WebCore::QNetworkReplyHandler::sendResponseIfNeeded):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworkqtQNetworkReplyHandlercpp">trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebCoremanualtestsloaddeferrerresumecrashhtml">trunk/WebCore/manual-tests/load-deferrer-resume-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (75156 => 75157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2011-01-06 16:24:42 UTC (rev 75156)
+++ trunk/WebCore/ChangeLog 2011-01-06 16:31:47 UTC (rev 75157)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2011-01-06 Jan Erik Hanssen <jhanssen@sencha.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] crash in QNetworkReplyHandler::sendResponseIfNeeded()
+ https://bugs.webkit.org/show_bug.cgi?id=51453
+
+ Check if m_reply is NULL before accessing.
+
+ * manual-tests/load-deferrer-resume-crash.html: Added.
+ * platform/network/qt/QNetworkReplyHandler.cpp:
+ (WebCore::QNetworkReplyHandler::setLoadMode):
+ (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
</ins><span class="cx"> 2011-01-06 Andras Becsi <abecsi@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Csaba Osztrogonác.
</span></span></pre></div>
<a id="trunkWebCoremanualtestsloaddeferrerresumecrashhtml"></a>
<div class="addfile"><h4>Added: \
trunk/WebCore/manual-tests/load-deferrer-resume-crash.html (0 => 75157)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/WebCore/manual-tests/load-deferrer-resume-crash.html \
(rev 0)
+++ trunk/WebCore/manual-tests/load-deferrer-resume-crash.html 2011-01-06 16:31:47 \
UTC (rev 75157) </span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<html>
+<head>
+<script>
+var counter = 0;
+
+function loadJSFile(){
+ var i = document.createElement('img')
+ i.setAttribute("src", "resources/apple.jpg?counter=" + \
counter); +
+ counter++;
+
+ document.getElementById("images").appendChild(i);
+}
+
+function runModal()
+{
+ loadJSFile();
+
+ alert("Deferring loads");
+}
+</script>
+</head>
+
+<body>
+
+<input id="button" type="button" value="click me" \
onclick="runModal()"/> +
+<div id="images"></div>
+
+<p>Click the above button to start loading an image and then open an alert() \
box. For the test to pass there should be no crash when closing the alert \
box.</p> +
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkWebCoreplatformnetworkqtQNetworkReplyHandlercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (75156 => 75157)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-01-06 16:24:42 UTC \
(rev 75156)
+++ trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-01-06 16:31:47 \
UTC (rev 75157) </span><span class="lines">@@ -242,13 +242,20 @@
</span><span class="cx"> case LoadNormal:
</span><span class="cx"> m_loadMode = LoadResuming;
</span><span class="cx"> emit processQueuedItems();
</span><del>- // Restart forwarding only after processQueuedItems to make sure
- // our buffered data was handled before any incoming data.
- m_reply->setForwardingDefered(false);
</del><ins>+
+ // sendQueuedItems() may cause m_reply to be set to 0 due to the finish() \
call causing + // the ResourceHandle instance that owns this \
QNetworkReplyHandler to be destroyed. + if (m_reply) {
+ // Restart forwarding only after processQueuedItems to make sure
+ // our buffered data was handled before any incoming data.
+ m_reply->setForwardingDefered(false);
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case LoadDeferred:
</span><del>- m_loadMode = LoadDeferred;
- m_reply->setForwardingDefered(true);
</del><ins>+ if (m_reply) {
+ m_loadMode = LoadDeferred;
+ m_reply->setForwardingDefered(true);
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case LoadResuming:
</span><span class="cx"> Q_ASSERT(0); // should never happen
</span><span class="lines">@@ -349,6 +356,9 @@
</span><span class="cx"> if (m_shouldSendResponse)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!m_reply)
+ return;
+
</ins><span class="cx"> if (m_reply->error() && \
!ignoreHttpError(m_reply, m_responseContainsData)) </span><span class="cx"> \
return; </span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic