<!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>[197289] releases/WebKitGTK/webkit-2.4</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/197289">197289</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-28 06:23:43 -0800 (Sun, 28 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180128">r180128</a> - Crash when accessing an item in SVGLengthList and then replacing it with a previous item in the list.
https://bugs.webkit.org/show_bug.cgi?id=141552.
Reviewed by Darin Adler.
Source/WebCore:
Tests: LayoutTests/svg/dom/SVGLengthList-basics.xhtml: This test is modified to
include a new test case.
* svg/properties/SVGListPropertyTearOff.h: Commit the removal of the replacing item
before trying to detach the wrapper of the item which going to be replaced.
LayoutTests:
* svg/dom/SVGLengthList-basics-expected.txt:
* svg/dom/SVGLengthList-basics.xhtml: Add a new test case to this test. Have a
reference to an SVGLength in an SVGLengthList and then replace this SVGLength
with another one which comes before it in the SVGLengthList.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestssvgdomSVGLengthListbasicsexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestssvgdomSVGLengthListbasicsxhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics.xhtml</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoresvgpropertiesSVGListPropertyTearOffh">releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/properties/SVGListPropertyTearOff.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (197288 => 197289)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2016-02-28 14:01:55 UTC (rev 197288)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2016-02-28 14:23:43 UTC (rev 197289)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-15 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Crash when accessing an item in SVGLengthList and then replacing it with a previous item in the list.
+ https://bugs.webkit.org/show_bug.cgi?id=141552.
+
+ Reviewed by Darin Adler.
+
+ * svg/dom/SVGLengthList-basics-expected.txt:
+ * svg/dom/SVGLengthList-basics.xhtml: Add a new test case to this test. Have a
+ reference to an SVGLength in an SVGLengthList and then replace this SVGLength
+ with another one which comes before it in the SVGLengthList.
+
</ins><span class="cx"> 2015-04-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up access checks in JSHistoryCustom.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestssvgdomSVGLengthListbasicsexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt (197288 => 197289)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt 2016-02-28 14:01:55 UTC (rev 197288)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics-expected.txt 2016-02-28 14:23:43 UTC (rev 197289)
</span><span class="lines">@@ -119,6 +119,22 @@
</span><span class="cx"> Set x='1 2 3 4' for text1
</span><span class="cx"> PASS text1.setAttribute('x', '1 2 3 4') is undefined.
</span><span class="cx">
</span><ins>+Test overlapping edge cases for replaceItem()
+PASS text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 3) is text1.x.baseVal.getItem(2)
+PASS text1.x.baseVal.numberOfItems is 3
+PASS text1.x.baseVal.getItem(2).value is 2
+PASS text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 2) is text1.x.baseVal.getItem(1)
+PASS text1.x.baseVal.numberOfItems is 2
+PASS text1.x.baseVal.getItem(1).value is 4
+PASS text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 1) is text1.x.baseVal.getItem(0)
+PASS text1.x.baseVal.numberOfItems is 1
+PASS text1.x.baseVal.getItem(0).value is 6
+PASS text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 0) is text1.x.baseVal.getItem(0)
+PASS text1.x.baseVal.numberOfItems is 1
+
+Set x='1 2 3 4' for text1
+PASS text1.setAttribute('x', '1 2 3 4') is undefined.
+
</ins><span class="cx"> Test uncommon arguments for removeItem()
</span><span class="cx"> PASS text1.x.baseVal.removeItem(30) threw exception Error: IndexSizeError: DOM Exception 1.
</span><span class="cx"> PASS text1.x.baseVal.removeItem(0).value is 1
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestssvgdomSVGLengthListbasicsxhtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics.xhtml (197288 => 197289)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics.xhtml 2016-02-28 14:01:55 UTC (rev 197288)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/svg/dom/SVGLengthList-basics.xhtml 2016-02-28 14:23:43 UTC (rev 197289)
</span><span class="lines">@@ -155,6 +155,31 @@
</span><span class="cx"> shouldBeUndefined("text1.setAttribute('x', '1 2 3 4')");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><ins>+ debug("Test overlapping edge cases for replaceItem()");
+ var item = text1.x.baseVal.getItem(3);
+ shouldBe("text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 3)", "text1.x.baseVal.getItem(2)");
+ shouldBe("text1.x.baseVal.numberOfItems", "3");
+ item = text1.x.baseVal.getItem(2);
+ item.newValueSpecifiedUnits(item.unitType, item.value * 2);
+ shouldBe("text1.x.baseVal.getItem(2).value", "2");
+ shouldBe("text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 2)", "text1.x.baseVal.getItem(1)");
+ shouldBe("text1.x.baseVal.numberOfItems", "2");
+ item = text1.x.baseVal.getItem(1);
+ item.newValueSpecifiedUnits(item.unitType, item.value * 2);
+ shouldBe("text1.x.baseVal.getItem(1).value", "4");
+ shouldBe("text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 1)", "text1.x.baseVal.getItem(0)");
+ shouldBe("text1.x.baseVal.numberOfItems", "1");
+ item = text1.x.baseVal.getItem(0);
+ item.newValueSpecifiedUnits(item.unitType, item.value * 2);
+ shouldBe("text1.x.baseVal.getItem(0).value", "6");
+ shouldBe("text1.x.baseVal.replaceItem(text1.x.baseVal.getItem(0), 0)", "text1.x.baseVal.getItem(0)");
+ shouldBe("text1.x.baseVal.numberOfItems", "1");
+
+ debug("");
+ debug("Set x='1 2 3 4' for text1");
+ shouldBeUndefined("text1.setAttribute('x', '1 2 3 4')");
+
+ debug("");
</ins><span class="cx"> debug("Test uncommon arguments for removeItem()");
</span><span class="cx"> shouldThrow("text1.x.baseVal.removeItem(30)");
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197288 => 197289)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-28 14:01:55 UTC (rev 197288)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-02-28 14:23:43 UTC (rev 197289)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-15 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Crash when accessing an item in SVGLengthList and then replacing it with a previous item in the list.
+ https://bugs.webkit.org/show_bug.cgi?id=141552.
+
+ Reviewed by Darin Adler.
+
+ Tests: LayoutTests/svg/dom/SVGLengthList-basics.xhtml: This test is modified to
+ include a new test case.
+
+ * svg/properties/SVGListPropertyTearOff.h: Commit the removal of the replacing item
+ before trying to detach the wrapper of the item which going to be replaced.
+
</ins><span class="cx"> 2015-04-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up access checks in JSHistoryCustom.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoresvgpropertiesSVGListPropertyTearOffh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/properties/SVGListPropertyTearOff.h (197288 => 197289)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/properties/SVGListPropertyTearOff.h 2016-02-28 14:01:55 UTC (rev 197288)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/properties/SVGListPropertyTearOff.h 2016-02-28 14:23:43 UTC (rev 197289)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> if (!livesInOtherList && indexToModify && static_cast<unsigned>(indexToRemove) == *indexToModify)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- propertyTearOff->removeItemFromList(indexToRemove, livesInOtherList);
</del><ins>+ propertyTearOff->removeItemFromList(indexToRemove, true);
</ins><span class="cx">
</span><span class="cx"> if (!indexToModify)
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>