<!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>[179062] branches/safari-600.1.4.15-branch/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/179062">179062</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-24 09:00:24 -0800 (Sat, 24 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged branch-only patch (<a href="http://trac.webkit.org/projects/webkit/changeset/0">r0</a>).  rdar://problem/19564738</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedResourcecpp">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreloadercacheCachedResourceh">branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179061 => 179062)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog        2015-01-24 16:28:14 UTC (rev 179061)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog        2015-01-24 17:00:24 UTC (rev 179062)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-23  Pratik Solanki  &lt;psolanki@apple.com&gt;
+
+        &lt;rdar://problem/19564738&gt; Stowe: CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::SharedBuffer::createPurgeableBuffer const + 14
+
+        Reviewed by David Kilzer.
+
+        Speculative fix for the above crash. The current theory is that a timer is being fired for a
+        CachedResource that has been freed. Add a marker field in CachedResource to do an early
+        return from CachedResource::makePurgeable() when this happens.
+
+        No new tests because I can't reproduce the crash.
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::CachedResource):
+        (WebCore::CachedResource::~CachedResource):
+        (WebCore::CachedResource::makePurgeable):
+        * loader/cache/CachedResource.h:
+
</ins><span class="cx"> 2015-01-23  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Build fix after r179028, r179030, r179031, r179032. 
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp (179061 => 179062)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp        2015-01-24 16:28:14 UTC (rev 179061)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.cpp        2015-01-24 17:00:24 UTC (rev 179062)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+static const unsigned LiveMarker = 0xCACED;
+
</ins><span class="cx"> // These response headers are not copied from a revalidated response to the
</span><span class="cx"> // cached response headers. For compatibility, this list is based on Chromium's
</span><span class="cx"> // net/http/http_response_headers.cc.
</span><span class="lines">@@ -181,6 +183,7 @@
</span><span class="cx">     , m_owningCachedResourceLoader(0)
</span><span class="cx">     , m_resourceToRevalidate(0)
</span><span class="cx">     , m_proxyResource(0)
</span><ins>+    , m_liveObjectMarker(LiveMarker)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_type == unsigned(type)); // m_type is a bitfield, so this tests careless updates of the enum.
</span><span class="cx">     ASSERT(sessionID.isValid());
</span><span class="lines">@@ -212,6 +215,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_owningCachedResourceLoader)
</span><span class="cx">         m_owningCachedResourceLoader-&gt;removeCachedResource(this);
</span><ins>+    m_liveObjectMarker = 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CachedResource::failBeforeStarting()
</span><span class="lines">@@ -801,6 +805,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool CachedResource::makePurgeable(bool purgeable) 
</span><span class="cx"> { 
</span><ins>+    if (m_liveObjectMarker != LiveMarker)
+        return false;
+
</ins><span class="cx">     if (purgeable) {
</span><span class="cx">         ASSERT(isSafeToMakePurgeable());
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h (179061 => 179062)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h        2015-01-24 16:28:14 UTC (rev 179061)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/loader/cache/CachedResource.h        2015-01-24 17:00:24 UTC (rev 179062)
</span><span class="lines">@@ -369,6 +369,7 @@
</span><span class="cx"> 
</span><span class="cx">     // These handles will need to be updated to point to the m_resourceToRevalidate in case we get 304 response.
</span><span class="cx">     HashSet&lt;CachedResourceHandleBase*&gt; m_handlesToRevalidate;
</span><ins>+    unsigned m_liveObjectMarker;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> #define CACHED_RESOURCE_TYPE_CASTS(ToClassName, FromClassName, CachedResourceType) \
</span></span></pre>
</div>
</div>

</body>
</html>