<!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>[200511] 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/200511">200511</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-05-06 08:53:10 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use invalidated ResourceLoadStatistics iterators
https://bugs.webkit.org/show_bug.cgi?id=157412
<rdar://problem/26133153>
Reviewed by Chris Dumez.
ResourceLoadObserver::logFrameNavigation was using references bound to the 'value'
member of iterators from the ResourceLoadStatistics HashMap. When new entries were
added, these iterators were invalidated causing the references to refer to invalid
memory.
Renamed 'resourceStatisticsForPrimaryDomain' to 'ensureResourceStatisticsForPrimaryDomain'
to clarify that it may mutate the underlying HashMap, thereby invalidating any
existing iterators.
* loader/ResourceLoadObserver.cpp:
(WebCore::ResourceLoadObserver::logFrameNavigation): Protect against HashMap
elements being copied/moved when new intries are added.
* loader/ResourceLoadStatisticsStore.cpp:
(WebCore::ResourceLoadStatisticsStore::setResourceStatisticsForPrimaryDomain): Added.
* loader/ResourceLoadStatisticsStore.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadObservercpp">trunk/Source/WebCore/loader/ResourceLoadObserver.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsStorecpp">trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsStoreh">trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200510 => 200511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-06 08:17:12 UTC (rev 200510)
+++ trunk/Source/WebCore/ChangeLog 2016-05-06 15:53:10 UTC (rev 200511)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-06 Brent Fulgham <bfulgham@apple.com>
+
+ Don't use invalidated ResourceLoadStatistics iterators
+ https://bugs.webkit.org/show_bug.cgi?id=157412
+ <rdar://problem/26133153>
+
+ Reviewed by Chris Dumez.
+
+ ResourceLoadObserver::logFrameNavigation was using references bound to the 'value'
+ member of iterators from the ResourceLoadStatistics HashMap. When new entries were
+ added, these iterators were invalidated causing the references to refer to invalid
+ memory.
+
+ Renamed 'resourceStatisticsForPrimaryDomain' to 'ensureResourceStatisticsForPrimaryDomain'
+ to clarify that it may mutate the underlying HashMap, thereby invalidating any
+ existing iterators.
+
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::logFrameNavigation): Protect against HashMap
+ elements being copied/moved when new intries are added.
+ * loader/ResourceLoadStatisticsStore.cpp:
+ (WebCore::ResourceLoadStatisticsStore::setResourceStatisticsForPrimaryDomain): Added.
+ * loader/ResourceLoadStatisticsStore.h:
+
</ins><span class="cx"> 2016-05-06 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Unprefix CSS Grid Layout properties
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadObserver.cpp (200510 => 200511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2016-05-06 08:17:12 UTC (rev 200510)
+++ trunk/Source/WebCore/loader/ResourceLoadObserver.cpp 2016-05-06 15:53:10 UTC (rev 200511)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto targetOrigin = SecurityOrigin::create(targetURL);
</span><del>- auto& targetStatistics = m_store->resourceStatisticsForPrimaryDomain(targetPrimaryDomain);
</del><ins>+ auto targetStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
</ins><span class="cx">
</span><span class="cx"> if (isMainFrame)
</span><span class="cx"> targetStatistics.topFrameHasBeenNavigatedToBefore = true;
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isRedirect) {
</span><del>- auto& redirectingOriginResourceStatistics = m_store->resourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</del><ins>+ auto& redirectingOriginResourceStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</ins><span class="cx">
</span><span class="cx"> if (m_store->isPrevalentResource(targetPrimaryDomain))
</span><span class="cx"> redirectingOriginResourceStatistics.redirectedToOtherPrevalentResourceOrigins.add(targetPrimaryDomain);
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> else
</span><span class="cx"> ++targetStatistics.subframeSubResourceCount;
</span><span class="cx"> } else {
</span><del>- auto& sourceOriginResourceStatistics = m_store->resourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</del><ins>+ auto& sourceOriginResourceStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</ins><span class="cx">
</span><span class="cx"> if (isMainFrame) {
</span><span class="cx"> ++sourceOriginResourceStatistics.topFrameHasBeenNavigatedFrom;
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_store->setResourceStatisticsForPrimaryDomain(targetPrimaryDomain, WTFMove(targetStatistics));
</ins><span class="cx"> m_store->fireDataModificationHandler();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,13 +176,13 @@
</span><span class="cx"> if (targetPrimaryDomain == mainFramePrimaryDomain || targetPrimaryDomain == sourcePrimaryDomain)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto& targetStatistics = m_store->resourceStatisticsForPrimaryDomain(targetPrimaryDomain);
</del><ins>+ auto& targetStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
</ins><span class="cx">
</span><span class="cx"> auto mainFrameOrigin = SecurityOrigin::create(mainFrameURL);
</span><span class="cx"> targetStatistics.subresourceUnderTopFrameOrigins.add(mainFramePrimaryDomain);
</span><span class="cx">
</span><span class="cx"> if (isRedirect) {
</span><del>- auto& redirectingOriginStatistics = m_store->resourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</del><ins>+ auto& redirectingOriginStatistics = m_store->ensureResourceStatisticsForPrimaryDomain(sourcePrimaryDomain);
</ins><span class="cx">
</span><span class="cx"> if (m_store->isPrevalentResource(targetPrimaryDomain))
</span><span class="cx"> redirectingOriginStatistics.redirectedToOtherPrevalentResourceOrigins.add(targetPrimaryDomain);
</span><span class="lines">@@ -219,7 +220,7 @@
</span><span class="cx"> if (needPrivacy)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto& statistics = m_store->resourceStatisticsForPrimaryDomain(primaryDomain(document.url()));
</del><ins>+ auto& statistics = m_store->ensureResourceStatisticsForPrimaryDomain(primaryDomain(document.url()));
</ins><span class="cx"> statistics.hadUserInteraction = true;
</span><span class="cx"> m_store->fireDataModificationHandler();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp (200510 => 200511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp 2016-05-06 08:17:12 UTC (rev 200510)
+++ trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.cpp 2016-05-06 15:53:10 UTC (rev 200511)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> return mapEntry->value.isPrevalentResource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ResourceLoadStatistics& ResourceLoadStatisticsStore::resourceStatisticsForPrimaryDomain(const String& primaryDomain)
</del><ins>+ResourceLoadStatistics& ResourceLoadStatisticsStore::ensureResourceStatisticsForPrimaryDomain(const String& primaryDomain)
</ins><span class="cx"> {
</span><span class="cx"> auto addResult = m_resourceStatisticsMap.ensure(primaryDomain, [&primaryDomain] {
</span><span class="cx"> return ResourceLoadStatistics(primaryDomain);
</span><span class="lines">@@ -66,6 +66,11 @@
</span><span class="cx"> return addResult.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ResourceLoadStatisticsStore::setResourceStatisticsForPrimaryDomain(const String& primaryDomain, ResourceLoadStatistics&& statistics)
+{
+ m_resourceStatisticsMap.set(primaryDomain, WTFMove(statistics));
+}
+
</ins><span class="cx"> typedef HashMap<String, ResourceLoadStatistics>::KeyValuePairType StatisticsValue;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<KeyedEncoder> ResourceLoadStatisticsStore::createEncoderFromData()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h (200510 => 200511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h 2016-05-06 08:17:12 UTC (rev 200510)
+++ trunk/Source/WebCore/loader/ResourceLoadStatisticsStore.h 2016-05-06 15:53:10 UTC (rev 200511)
</span><span class="lines">@@ -49,7 +49,8 @@
</span><span class="cx"> size_t size() const { return m_resourceStatisticsMap.size(); }
</span><span class="cx"> void clear() { m_resourceStatisticsMap.clear(); }
</span><span class="cx">
</span><del>- ResourceLoadStatistics& resourceStatisticsForPrimaryDomain(const String&);
</del><ins>+ ResourceLoadStatistics& ensureResourceStatisticsForPrimaryDomain(const String&);
+ void setResourceStatisticsForPrimaryDomain(const String&, ResourceLoadStatistics&&);
</ins><span class="cx">
</span><span class="cx"> bool isPrevalentResource(const String&) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>