[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [124258] trunk
From: macpherson () chromium ! org
Date: 2012-07-31 22:36:20
Message-ID: 20120731223620.DC5454A1645 () svn ! webkit ! 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>[124258] trunk</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/124258">124258</a></dd> \
<dt>Author</dt> <dd>macpherson@chromium.org</dd> <dt>Date</dt> <dd>2012-07-31 \
15:36:20 -0700 (Tue, 31 Jul 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>Heap-use-after-free in WebCore::StyleResolver::loadPendingImage
https://bugs.webkit.org/show_bug.cgi?id=92606
Reviewed by Abhishek Arya.
Source/WebCore:
Changes StyleResolver's m_pendingImageProperties set to a map, such that for each \
property we keep a RefPtr to the CSSValue used to set that property. This ensures \
that CSSValues are not freed before they are needed by loadPendingImage.
Test: fast/css/variables/deferred-image-load-from-variable.html
* css/StyleResolver.cpp:
* css/StyleResolver.h:
LayoutTests:
Exercises the codepath where an image is loaded using a url specified via a variable.
* fast/css/variables/deferred-image-load-from-variable-expected.txt: Added.
* fast/css/variables/deferred-image-load-from-variable.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssvariablesdeferredimageloadfromvariableexpectedtxt \
">trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssvariablesdeferredimageloadfromvariablehtml">trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (124257 => \
124258)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2012-07-31 22:34:18 UTC (rev \
124257)
+++ trunk/LayoutTests/ChangeLog 2012-07-31 22:36:20 UTC (rev 124258)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2012-07-31 Luke Macpherson <macpherson@chromium.org>
+
+ Heap-use-after-free in WebCore::StyleResolver::loadPendingImage
+ https://bugs.webkit.org/show_bug.cgi?id=92606
+
+ Reviewed by Abhishek Arya.
+
+ Exercises the codepath where an image is loaded using a url specified via a \
variable. +
+ * fast/css/variables/deferred-image-load-from-variable-expected.txt: Added.
+ * fast/css/variables/deferred-image-load-from-variable.html: Added.
+
</ins><span class="cx"> 2012-07-31 Peter Kasting <pkasting@google.com>
</span><span class="cx">
</span><span class="cx"> [Chromium] Rebaselines.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssvariablesdeferredimageloadfromvariableexpectedtxt"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt \
(0 => 124258)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt \
(rev 0)
+++ trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt 2012-07-31 \
22:36:20 UTC (rev 124258) </span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test is successful if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssvariablesdeferredimageloadfromvariablehtml"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable.html (0 => \
124258)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable.html \
(rev 0)
+++ trunk/LayoutTests/fast/css/variables/deferred-image-load-from-variable.html 2012-07-31 \
22:36:20 UTC (rev 124258) </span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ internals.settings.setCSSVariablesEnabled(true);
+}
+</script>
+<style>
+div {
+ -webkit-var-a: url(1);
+ -webkit-mask: -webkit-var(a);
+}
+</style>
+<div></div>
+This test is successful if it does not crash.
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (124257 => \
124258)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2012-07-31 22:34:18 UTC (rev \
124257)
+++ trunk/Source/WebCore/ChangeLog 2012-07-31 22:36:20 UTC (rev 124258)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2012-07-31 Luke Macpherson <macpherson@chromium.org>
+
+ Heap-use-after-free in WebCore::StyleResolver::loadPendingImage
+ https://bugs.webkit.org/show_bug.cgi?id=92606
+
+ Reviewed by Abhishek Arya.
+
+ Changes StyleResolver's m_pendingImageProperties set to a map, such that for \
each property we keep + a RefPtr to the CSSValue used to set that property. \
This ensures that CSSValues are not freed before + they are needed by \
loadPendingImage. +
+ Test: fast/css/variables/deferred-image-load-from-variable.html
+
+ * css/StyleResolver.cpp:
+ * css/StyleResolver.h:
+
</ins><span class="cx"> 2012-07-31 Chris Rogers <crogers@google.com>
</span><span class="cx">
</span><span class="cx"> Add stub implementation for \
MediaStreamAudioSourceNode </span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (124257 \
=> 124258)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-07-31 22:34:18 \
UTC (rev 124257)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-07-31 22:36:20 UTC (rev 124258)
</span><span class="lines">@@ -4464,14 +4464,14 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StyleImage> image = \
value->cachedOrPendingImage(); </span><span class="cx"> if (image && \
image->isPendingImage()) </span><del>- \
m_pendingImageProperties.add(property); </del><ins>+ \
m_pendingImageProperties.set(property, value); </ins><span class="cx"> return \
image.release(); </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleImage> \
StyleResolver::generatedOrPendingFromValue(CSSPropertyID property, \
CSSImageGeneratorValue* value) </span><span class="cx"> {
</span><span class="cx"> if (value->isPending()) {
</span><del>- m_pendingImageProperties.add(property);
</del><ins>+ m_pendingImageProperties.set(property, value);
</ins><span class="cx"> return StylePendingImage::create(value);
</span><span class="cx"> }
</span><span class="cx"> return StyleGeneratedImage::create(value);
</span><span class="lines">@@ -4482,7 +4482,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StyleImage> image = \
value->cachedOrPendingImageSet(document()); </span><span class="cx"> if (image \
&& image->isPendingImage()) </span><del>- \
m_pendingImageProperties.add(property); </del><ins>+ \
m_pendingImageProperties.set(property, value); </ins><span class="cx"> return \
image.release(); </span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -5539,8 +5539,8 @@
</span><span class="cx"> if (m_pendingImageProperties.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- HashSet<CSSPropertyID>::const_iterator end = \
m_pendingImageProperties.end();
- for (HashSet<CSSPropertyID>::const_iterator it = \
m_pendingImageProperties.begin(); it != end; ++it) { </del><ins>+ \
PendingImagePropertyMap::const_iterator::Keys end = \
m_pendingImageProperties.end().keys(); + for \
(PendingImagePropertyMap::const_iterator::Keys it = \
m_pendingImageProperties.begin().keys(); it != end; ++it) { </ins><span class="cx"> \
CSSPropertyID currentProperty = *it; </span><span class="cx">
</span><span class="cx"> switch (currentProperty) {
</span><span class="lines">@@ -5645,7 +5645,7 @@
</span><span class="cx"> info.addVector(m_matchedRules);
</span><span class="cx">
</span><span class="cx"> // FIXME: Instrument StaticCSSRuleList and add \
m_ruleList here. </span><del>- info.addHashSet(m_pendingImageProperties);
</del><ins>+ info.addHashMap(m_pendingImageProperties);
</ins><span class="cx"> info.addVector(m_viewportDependentMediaQueryResults);
</span><span class="cx"> info.addHashMap(m_styleRuleToCSSOMWrapperMap);
</span><span class="cx"> info.addHashSet(m_styleSheetCSSOMWrapperSet);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (124257 \
=> 124258)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2012-07-31 22:34:18 \
UTC (rev 124257)
+++ trunk/Source/WebCore/css/StyleResolver.h 2012-07-31 22:36:20 UTC (rev 124258)
</span><span class="lines">@@ -470,7 +470,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<StaticCSSRuleList> m_ruleList;
</span><span class="cx">
</span><del>- HashSet<CSSPropertyID> m_pendingImageProperties;
</del><ins>+ typedef HashMap<CSSPropertyID, RefPtr<CSSValue> > \
PendingImagePropertyMap; + PendingImagePropertyMap m_pendingImageProperties;
</ins><span class="cx">
</span><span class="cx"> OwnPtr<MediaQueryEvaluator> m_medium;
</span><span class="cx"> RefPtr<RenderStyle> m_rootDefaultStyle;
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic