<!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>[215012] releases/WebKitGTK/webkit-2.14</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/215012">215012</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-06 03:13:51 -0700 (Thu, 06 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212214">r212214</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/179497">r179497</a>): Crash inside setAttributeNode
https://bugs.webkit.org/show_bug.cgi?id=168161
<rdar://problem/30451581>
Reviewed by Andreas Kling.
Source/WebCore:
The bug was caused by setAttributeNode calling setAttributeInternal with the same element data as the one used
to call removeAttributeInternal despite of the fact removeAttributeInternal could have invoked arbitrary scripts
and mutated element's m_elementData.
Fixed the bug by calling with setAttributeInternal with the result of new invocation of ensureUniqueElementData().
Test: fast/dom/Attr/make-unique-element-data-while-replacing-attr.html
* dom/Element.cpp:
(WebCore::Element::setAttributeNode):
LayoutTests:
Added a regression test.
* fast/dom/Attr/make-unique-element-data-while-replacing-attr-expected.txt: Added.
* fast/dom/Attr/make-unique-element-data-while-replacing-attr.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoredomElementcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Element.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastdomAttrmakeuniqueelementdatawhilereplacingattrexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastdomAttrmakeuniqueelementdatawhilereplacingattrhtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (215011 => 215012)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-04-06 10:09:31 UTC (rev 215011)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-04-06 10:13:51 UTC (rev 215012)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION (r179497): Crash inside setAttributeNode
+ https://bugs.webkit.org/show_bug.cgi?id=168161
+ <rdar://problem/30451581>
+
+ Reviewed by Andreas Kling.
+
+ Added a regression test.
+
+ * fast/dom/Attr/make-unique-element-data-while-replacing-attr-expected.txt: Added.
+ * fast/dom/Attr/make-unique-element-data-while-replacing-attr.html: Added.
+
</ins><span class="cx"> 2017-02-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure Event keeps its current target element alive
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastdomAttrmakeuniqueelementdatawhilereplacingattrexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr-expected.txt (0 => 215012)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr-expected.txt 2017-04-06 10:13:51 UTC (rev 215012)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test making the element data unique while replacing an Attr node.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element.getAttribute("width") is "b"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastdomAttrmakeuniqueelementdatawhilereplacingattrhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr.html (0 => 215012)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/dom/Attr/make-unique-element-data-while-replacing-attr.html 2017-04-06 10:13:51 UTC (rev 215012)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../../resources/js-test.js"></script>
+<script>
+
+description('Test making the element data unique while replacing an Attr node.');
+
+let element = document.createElement('div');
+element.setAttribute('foo', 'bar');
+
+let oldAttr = document.createAttributeNS('http://www.w3.org/XML/1998/namespace', 'width');
+oldAttr.value = 'a';
+element.setAttributeNode(oldAttr);
+
+element.addEventListener('DOMSubtreeModified', () => { element.cloneNode(); }, true);
+
+let newAttr = document.createAttributeNS('http://www.w3.org/1999/xhtml','width');
+newAttr.value = 'b';
+element.setAttributeNode(newAttr);
+
+shouldBeEqualToString('element.getAttribute("width")', 'b');
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (215011 => 215012)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-04-06 10:09:31 UTC (rev 215011)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-04-06 10:13:51 UTC (rev 215012)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-12 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION (r179497): Crash inside setAttributeNode
+ https://bugs.webkit.org/show_bug.cgi?id=168161
+ <rdar://problem/30451581>
+
+ Reviewed by Andreas Kling.
+
+ The bug was caused by setAttributeNode calling setAttributeInternal with the same element data as the one used
+ to call removeAttributeInternal despite of the fact removeAttributeInternal could have invoked arbitrary scripts
+ and mutated element's m_elementData.
+
+ Fixed the bug by calling with setAttributeInternal with the result of new invocation of ensureUniqueElementData().
+
+ Test: fast/dom/Attr/make-unique-element-data-while-replacing-attr.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::setAttributeNode):
+
</ins><span class="cx"> 2017-02-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure Event keeps its current target element alive
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Element.cpp (215011 => 215012)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Element.cpp 2017-04-06 10:09:31 UTC (rev 215011)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/dom/Element.cpp 2017-04-06 10:13:51 UTC (rev 215012)
</span><span class="lines">@@ -2086,7 +2086,7 @@
</span><span class="cx"> setAttributeInternal(existingAttributeIndex, attrNode.qualifiedName(), attrNode.value(), NotInSynchronizationOfLazyAttribute);
</span><span class="cx"> else {
</span><span class="cx"> removeAttributeInternal(existingAttributeIndex, NotInSynchronizationOfLazyAttribute);
</span><del>- unsigned existingAttributeIndexForFullQualifiedName = elementData.findAttributeIndexByName(attrNode.qualifiedName());
</del><ins>+ unsigned existingAttributeIndexForFullQualifiedName = ensureUniqueElementData().findAttributeIndexByName(attrNode.qualifiedName());
</ins><span class="cx"> setAttributeInternal(existingAttributeIndexForFullQualifiedName, attrNode.qualifiedName(), attrNode.value(), NotInSynchronizationOfLazyAttribute);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>