<!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>[180767] 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/180767">180767</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 10:43:48 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use after free in WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle
https://bugs.webkit.org/show_bug.cgi?id=138366
Reviewed by Dave Hyatt.
This patch ensures that we clean up RenderNamedFlowFragment::m_renderObjectRegionStyle when embedded flow content is getting destroyed.
In m_renderObjectRegionStyle hash map, we store style information about the named flow's descendant children.
When a child is being detached from the tree, it removes itself from this hashmap.
We do it by traversing up on the ancestor chain and call removeFlowChildInfo() on the parent flow.
However in case of embedded flows (for example multicolumn content inside a region), we need to check whether the parent flow
is inside a flow too and continue the cleanup accordingly.
Source/WebCore:
Test: fast/regions/region-with-multicolumn-embedded-crash.html
* rendering/RenderObject.cpp:
(WebCore::RenderObject::removeFromRenderFlowThreadIncludingDescendants):
LayoutTests:
* fast/regions/region-with-multicolumn-embedded-crash-expected.txt: Added.
* fast/regions/region-with-multicolumn-embedded-crash.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="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsregionwithmulticolumnembeddedcrashexpectedtxt">trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionsregionwithmulticolumnembeddedcrashhtml">trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180766 => 180767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-27 18:33:39 UTC (rev 180766)
+++ trunk/LayoutTests/ChangeLog 2015-02-27 18:43:48 UTC (rev 180767)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-27 Zalan Bujtas <zalan@apple.com>
+
+ Use after free in WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle
+ https://bugs.webkit.org/show_bug.cgi?id=138366
+
+ Reviewed by Dave Hyatt.
+
+ This patch ensures that we clean up RenderNamedFlowFragment::m_renderObjectRegionStyle when embedded flow content is getting destroyed.
+
+ In m_renderObjectRegionStyle hash map, we store style information about the named flow's descendant children.
+ When a child is being detached from the tree, it removes itself from this hashmap.
+ We do it by traversing up on the ancestor chain and call removeFlowChildInfo() on the parent flow.
+ However in case of embedded flows (for example multicolumn content inside a region), we need to check whether the parent flow
+ is inside a flow too and continue the cleanup accordingly.
+
+ * fast/regions/region-with-multicolumn-embedded-crash-expected.txt: Added.
+ * fast/regions/region-with-multicolumn-embedded-crash.html: Added.
+
</ins><span class="cx"> 2015-02-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Add another batch of debug assert failures.
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsregionwithmulticolumnembeddedcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash-expected.txt (0 => 180767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash-expected.txt 2015-02-27 18:43:48 UTC (rev 180767)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+PASS if no crash or assert in debug.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsregionwithmulticolumnembeddedcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash.html (0 => 180767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash.html (rev 0)
+++ trunk/LayoutTests/fast/regions/region-with-multicolumn-embedded-crash.html 2015-02-27 18:43:48 UTC (rev 180767)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that region context cleanup with embedded flow content is done properly.</title>
+<style>
+ #article1 {
+ -webkit-flow-into: flow1;
+ }
+
+ #region1 {
+ -webkit-flow-from: flow1;
+ }
+
+ #p1 {
+ column-count: 2;
+ }
+
+ @-webkit-region #region1 {
+ #p1 {
+ color: red;
+ }
+ }
+</style>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<p>PASS if no crash or assert in debug.</p>
+<div id="article1">
+ <p id="p1">X</p>
+</div>
+<div id="region1"></div>
+<script>
+ var iframe = document.createElement("iframe");
+ document.head.parentNode.insertBefore(iframe, document.head.nextSibling);
+ document.execCommand("SelectAll");
+ document.designMode = "on";
+ document.execCommand("JustifyCenter", false, null);
+ var elem = document.getElementById("article1");
+ elem.parentNode.removeChild(elem);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180766 => 180767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-27 18:33:39 UTC (rev 180766)
+++ trunk/Source/WebCore/ChangeLog 2015-02-27 18:43:48 UTC (rev 180767)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-02-27 Zalan Bujtas <zalan@apple.com>
+
+ Use after free in WebCore::RenderNamedFlowFragment::restoreRegionObjectsOriginalStyle
+ https://bugs.webkit.org/show_bug.cgi?id=138366
+
+ Reviewed by Dave Hyatt.
+
+ This patch ensures that we clean up RenderNamedFlowFragment::m_renderObjectRegionStyle when embedded flow content is getting destroyed.
+
+ In m_renderObjectRegionStyle hash map, we store style information about the named flow's descendant children.
+ When a child is being detached from the tree, it removes itself from this hashmap.
+ We do it by traversing up on the ancestor chain and call removeFlowChildInfo() on the parent flow.
+ However in case of embedded flows (for example multicolumn content inside a region), we need to check whether the parent flow
+ is inside a flow too and continue the cleanup accordingly.
+
+ Test: fast/regions/region-with-multicolumn-embedded-crash.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::removeFromRenderFlowThreadIncludingDescendants):
+
</ins><span class="cx"> 2015-02-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add API to remove a single content filter.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (180766 => 180767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-02-27 18:33:39 UTC (rev 180766)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-02-27 18:43:48 UTC (rev 180767)
</span><span class="lines">@@ -1950,10 +1950,18 @@
</span><span class="cx">
</span><span class="cx"> // We have to ask for our containing flow thread as it may be above the removed sub-tree.
</span><span class="cx"> RenderFlowThread* flowThreadContainingBlock = this->flowThreadContainingBlock();
</span><del>- if (flowThreadContainingBlock)
</del><ins>+ while (flowThreadContainingBlock) {
</ins><span class="cx"> flowThreadContainingBlock->removeFlowChildInfo(this);
</span><ins>+ if (flowThreadContainingBlock->flowThreadState() == NotInsideFlowThread)
+ break;
+ RenderObject* parent = flowThreadContainingBlock->parent();
+ if (!parent)
+ break;
+ flowThreadContainingBlock = parent->flowThreadContainingBlock();
+ }
</ins><span class="cx"> if (is<RenderBlock>(*this))
</span><span class="cx"> downcast<RenderBlock>(*this).setCachedFlowThreadContainingBlockNeedsUpdate();
</span><ins>+
</ins><span class="cx"> if (shouldUpdateState)
</span><span class="cx"> setFlowThreadState(NotInsideFlowThread);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>