<!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>[42170] 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/42170">42170</a></dd>
<dt>Author</dt> <dd>kov@webkit.org</dd>
<dt>Date</dt> <dd>2009-04-02 09:00:55 -0700 (Thu, 02 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-02  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;

        Reviewed by Alexey Proskuryakov.

        Protect the handle when notifying the client that the response was
        received also in gotChunkCallback, or we crash in didReceiveData
        when the load is cancelled in didReceiveResponse.

        * platform/network/soup/ResourceHandleSoup.cpp:
        (WebCore::gotChunkCallback):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42169 => 42170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-02 15:50:37 UTC (rev 42169)
+++ trunk/WebCore/ChangeLog        2009-04-02 16:00:55 UTC (rev 42170)
</span><span class="lines">@@ -2,6 +2,17 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alexey Proskuryakov.
</span><span class="cx"> 
</span><ins>+        Protect the handle when notifying the client that the response was
+        received also in gotChunkCallback, or we crash in didReceiveData
+        when the load is cancelled in didReceiveResponse.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::gotChunkCallback):
+
+2009-04-02  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
+
+        Reviewed by Alexey Proskuryakov.
+
</ins><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=25001
</span><span class="cx">         Crash when content type parameters have no value
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp (42169 => 42170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2009-04-02 15:50:37 UTC (rev 42169)
+++ trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2009-04-02 16:00:55 UTC (rev 42170)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">         || (msg-&gt;status_code == SOUP_STATUS_UNAUTHORIZED))
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    ResourceHandle* handle = static_cast&lt;ResourceHandle*&gt;(data);
</del><ins>+    RefPtr&lt;ResourceHandle&gt; handle = static_cast&lt;ResourceHandle*&gt;(data);
</ins><span class="cx">     if (!handle)
</span><span class="cx">         return;
</span><span class="cx">     ResourceHandleInternal* d = handle-&gt;getInternal();
</span><span class="lines">@@ -308,11 +308,15 @@
</span><span class="cx">         g_free(contentType);
</span><span class="cx"> 
</span><span class="cx">         fillResponseFromMessage(msg, &amp;d-&gt;m_response);
</span><del>-        client-&gt;didReceiveResponse(handle, d-&gt;m_response);
</del><ins>+        client-&gt;didReceiveResponse(handle.get(), d-&gt;m_response);
</ins><span class="cx">         d-&gt;m_reportedHeaders = true;
</span><ins>+
+        // the didReceiveResponse call above may have cancelled the request
+        if (d-&gt;m_cancelled)
+            return;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    client-&gt;didReceiveData(handle, chunk-&gt;data, chunk-&gt;length, false);
</del><ins>+    client-&gt;didReceiveData(handle.get(), chunk-&gt;data, chunk-&gt;length, false);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Called at the end of the message, with all the necessary about the last informations.
</span></span></pre>
</div>
</div>

</body>
</html>