<!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>[201565] 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/201565">201565</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-01 13:15:23 -0700 (Wed, 01 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix null dereferencing in ResourceTimingInformation::addResourceTiming
https://bugs.webkit.org/show_bug.cgi?id=158266
rdar://problem/26528466
Patch by Alex Christensen <achristensen@webkit.org> on 2016-06-01
Reviewed by Chris Dumez.
This would crash sometimes in http/tests/security/cross-frame-access-custom.html
* loader/ResourceTimingInformation.cpp:
(WebCore::ResourceTimingInformation::addResourceTiming):
* loader/ResourceTimingInformation.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::loadDone):
We would dereference a null pointer on the first instruction when calling
Document::parentDocument from ResourceTimingInformation::addResourceTiming,
which means the document was null. CachedResourceLoader::document even has
a comment saying it can be null, so we should check it before using it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceTimingInformationcpp">trunk/Source/WebCore/loader/ResourceTimingInformation.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceTimingInformationh">trunk/Source/WebCore/loader/ResourceTimingInformation.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201564 => 201565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-01 19:55:38 UTC (rev 201564)
+++ trunk/Source/WebCore/ChangeLog        2016-06-01 20:15:23 UTC (rev 201565)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-06-01 Alex Christensen <achristensen@webkit.org>
+
+ Fix null dereferencing in ResourceTimingInformation::addResourceTiming
+ https://bugs.webkit.org/show_bug.cgi?id=158266
+ rdar://problem/26528466
+
+ Reviewed by Chris Dumez.
+
+ This would crash sometimes in http/tests/security/cross-frame-access-custom.html
+
+ * loader/ResourceTimingInformation.cpp:
+ (WebCore::ResourceTimingInformation::addResourceTiming):
+ * loader/ResourceTimingInformation.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestResource):
+ (WebCore::CachedResourceLoader::loadDone):
+ We would dereference a null pointer on the first instruction when calling
+ Document::parentDocument from ResourceTimingInformation::addResourceTiming,
+ which means the document was null. CachedResourceLoader::document even has
+ a comment saying it can be null, so we should check it before using it.
+
</ins><span class="cx"> 2016-06-01 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> SVGImage should report its memory cost to JS garbage collector
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceTimingInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.cpp (201564 => 201565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceTimingInformation.cpp        2016-06-01 19:55:38 UTC (rev 201564)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.cpp        2016-06-01 20:15:23 UTC (rev 201565)
</span><span class="lines">@@ -38,17 +38,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void ResourceTimingInformation::addResourceTiming(CachedResource* resource, Document* document)
</del><ins>+void ResourceTimingInformation::addResourceTiming(CachedResource* resource, Document& document)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled());
</span><span class="cx"> if (resource && resource->resourceRequest().url().protocolIsInHTTPFamily()
</span><span class="cx"> && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
</span><del>- HashMap<CachedResource*, InitiatorInfo>::iterator initiatorIt = m_initiatorMap.find(resource);
</del><ins>+ auto initiatorIt = m_initiatorMap.find(resource);
</ins><span class="cx"> if (initiatorIt != m_initiatorMap.end() && initiatorIt->value.added == NotYetAdded) {
</span><del>- ASSERT(document);
- Document* initiatorDocument = document;
</del><ins>+ Document* initiatorDocument = &document;
</ins><span class="cx"> if (resource->type() == CachedResource::MainResource)
</span><del>- initiatorDocument = document->parentDocument();
</del><ins>+ initiatorDocument = document.parentDocument();
</ins><span class="cx"> ASSERT(initiatorDocument);
</span><span class="cx"> ASSERT(initiatorDocument->domWindow());
</span><span class="cx"> ASSERT(initiatorDocument->domWindow()->performance());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceTimingInformationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.h (201564 => 201565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceTimingInformation.h        2016-06-01 19:55:38 UTC (rev 201564)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.h        2016-06-01 20:15:23 UTC (rev 201565)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class ResourceTimingInformation {
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- void addResourceTiming(CachedResource*, Document*);
</del><ins>+ void addResourceTiming(CachedResource*, Document&);
</ins><span class="cx"> void storeResourceTimingInitiatorInformation(const CachedResourceHandle<CachedResource>&, const CachedResourceRequest&, Frame*);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (201564 => 201565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2016-06-01 19:55:38 UTC (rev 201564)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2016-06-01 20:15:23 UTC (rev 201565)
</span><span class="lines">@@ -619,9 +619,9 @@
</span><span class="cx"> logMemoryCacheResourceRequest(frame(), DiagnosticLoggingKeys::inMemoryCacheKey(), DiagnosticLoggingKeys::usedKey());
</span><span class="cx"> memoryCache.resourceAccessed(*resource);
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()) {
</del><ins>+ if (document() && RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()) {
</ins><span class="cx"> m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
</span><del>- m_resourceTimingInfo.addResourceTiming(resource.get(), document());
</del><ins>+ m_resourceTimingInfo.addResourceTiming(resource.get(), *document());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> break;
</span><span class="lines">@@ -967,8 +967,8 @@
</span><span class="cx"> RefPtr<Document> protectDocument(m_document);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING)
</span><del>- if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
- m_resourceTimingInfo.addResourceTiming(resource, document());
</del><ins>+ if (document() && RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
+ m_resourceTimingInfo.addResourceTiming(resource, *document());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(resource);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>