<!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>[184156] releases/WebKitGTK/webkit-2.8</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/184156">184156</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-12 00:03:24 -0700 (Tue, 12 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183538">r183538</a> - Fix crash in WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock().
https://bugs.webkit.org/show_bug.cgi?id=140261

Patch by Hyungwook Lee &lt;hyungwook.lee@navercorp.com&gt; on 2015-04-29
Reviewed by Darin Adler.

Source/WebCore:

We need to check whether RenderObject is valid in RenderView::fooSubtreeSelection functions
because invalid object has caused a crash. This patch adds isValidObjectForNewSelection(), and use it.

* rendering/RenderView.cpp:
(WebCore::isValidObjectForNewSelection):
(WebCore::RenderView::clearSubtreeSelection):
(WebCore::RenderView::applySubtreeSelection):

LayoutTests:

* editing/execCommand/crash-140261-expected.txt: Added.
* editing/execCommand/crash-140261.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestseditingexecCommandcrash140261expectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestseditingexecCommandcrash140261html">releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184155 => 184156)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog        2015-05-12 07:01:52 UTC (rev 184155)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog        2015-05-12 07:03:24 UTC (rev 184156)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-29  Hyungwook Lee  &lt;hyungwook.lee@navercorp.com&gt;
+
+        Fix crash in WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock().
+        https://bugs.webkit.org/show_bug.cgi?id=140261
+
+        Reviewed by Darin Adler.
+
+        * editing/execCommand/crash-140261-expected.txt: Added.
+        * editing/execCommand/crash-140261.html: Added.
+
</ins><span class="cx"> 2015-04-27  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Form control may be associated with the wrong HTML Form element after form id change
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestseditingexecCommandcrash140261expectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261-expected.txt (0 => 184156)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261-expected.txt                                (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261-expected.txt        2015-05-12 07:03:24 UTC (rev 184156)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+  
+Test for crash in WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock()
+
+This test passes if it doesn't crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestseditingexecCommandcrash140261html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261.html (0 => 184156)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/editing/execCommand/crash-140261.html        2015-05-12 07:03:24 UTC (rev 184156)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html contenteditable&gt;
+&lt;body&gt;
+    &lt;div&gt;&lt;/div&gt;
+    &lt;abbr&gt;
+        &lt;label&gt;
+            &lt;textarea&gt;&lt;/textarea&gt;
+        &lt;/label&gt;
+        &lt;embed&gt;&lt;/embed&gt;
+    &lt;/abbr&gt;
+&lt;/body&gt;
+&lt;script&gt;
+    if (window.testRunner)
+        testRunner.dumpAsText();
+
+    document.execCommand(&quot;selectall&quot;, false, null);
+    document.execCommand(&quot;insertorderedlist&quot;, false, null);
+    document.write(&quot;&lt;p&gt;Test for crash in WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock()&lt;/p&gt;&quot;);
+    document.write(&quot;&lt;p&gt;This test passes if it doesn't crash.&lt;/p&gt;&quot;);
+&lt;/script&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184155 => 184156)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-05-12 07:01:52 UTC (rev 184155)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-05-12 07:03:24 UTC (rev 184156)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-29  Hyungwook Lee  &lt;hyungwook.lee@navercorp.com&gt;
+
+        Fix crash in WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock().
+        https://bugs.webkit.org/show_bug.cgi?id=140261
+
+        Reviewed by Darin Adler.
+
+        We need to check whether RenderObject is valid in RenderView::fooSubtreeSelection functions
+        because invalid object has caused a crash. This patch adds isValidObjectForNewSelection(), and use it.
+
+        * rendering/RenderView.cpp:
+        (WebCore::isValidObjectForNewSelection):
+        (WebCore::RenderView::clearSubtreeSelection):
+        (WebCore::RenderView::applySubtreeSelection):
+
</ins><span class="cx"> 2015-04-27  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Form control may be associated with the wrong HTML Form element after form id change
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp (184155 => 184156)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp        2015-05-12 07:01:52 UTC (rev 184155)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp        2015-05-12 07:03:24 UTC (rev 184156)
</span><span class="lines">@@ -943,6 +943,11 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static inline bool isValidObjectForNewSelection(const SelectionSubtreeRoot&amp; root, const RenderObject&amp; object)
+{
+    return (object.canBeSelectionLeaf() || &amp;object == root.selectionData().selectionStart() || &amp;object == root.selectionData().selectionEnd()) &amp;&amp; object.selectionState() != RenderObject::SelectionNone &amp;&amp; object.containingBlock();
+}
+
</ins><span class="cx"> void RenderView::clearSubtreeSelection(const SelectionSubtreeRoot&amp; root, SelectionRepaintMode blockRepaintMode, OldSelectionData&amp; oldSelectionData) const
</span><span class="cx"> {
</span><span class="cx">     // Record the old selected objects.  These will be used later
</span><span class="lines">@@ -958,8 +963,7 @@
</span><span class="cx">     RenderObject* stop = rendererAfterPosition(root.selectionData().selectionEnd(), root.selectionData().selectionEndPos());
</span><span class="cx">     SelectionIterator selectionIterator(os);
</span><span class="cx">     while (os &amp;&amp; os != stop) {
</span><del>-        if ((os-&gt;canBeSelectionLeaf() || os == root.selectionData().selectionStart() || os == root.selectionData().selectionEnd())
-            &amp;&amp; os-&gt;selectionState() != SelectionNone) {
</del><ins>+        if (isValidObjectForNewSelection(root, *os)) {
</ins><span class="cx">             // Blocks are responsible for painting line gaps and margin gaps.  They must be examined as well.
</span><span class="cx">             oldSelectionData.selectedObjects.set(os, std::make_unique&lt;RenderSelectionInfo&gt;(*os, true));
</span><span class="cx">             if (blockRepaintMode == RepaintNewXOROld) {
</span><span class="lines">@@ -1013,7 +1017,7 @@
</span><span class="cx">     o = root.selectionData().selectionStart();
</span><span class="cx">     selectionIterator = SelectionIterator(o);
</span><span class="cx">     while (o &amp;&amp; o != stop) {
</span><del>-        if ((o-&gt;canBeSelectionLeaf() || o == root.selectionData().selectionStart() || o == root.selectionData().selectionEnd()) &amp;&amp; o-&gt;selectionState() != SelectionNone) {
</del><ins>+        if (isValidObjectForNewSelection(root, *o)) {
</ins><span class="cx">             std::unique_ptr&lt;RenderSelectionInfo&gt; selectionInfo = std::make_unique&lt;RenderSelectionInfo&gt;(*o, true);
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span></span></pre>
</div>
</div>

</body>
</html>