<!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>[167229] 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/167229">167229</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-14 02:37:30 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/164933">r164933</a> - Ensure keySplines is valid in SMIL animations
<http://webkit.org/b/129547>
<rdar://problem/15676128>
Reviewed by Darin Adler.
Merged from Blink (patch by Philip Rogers):
https://src.chromium.org/viewvc/blink?revision=156452&view=revision
http://crbug.com/276111
This patch fixes a crash in SMIL animations when keySplines are not
specified. The SMIL spec is clear on this:
http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncCalcMode
"If there are any errors in the keyTimes specification (bad values,
too many or too few values), the animation will have no effect."
This patch simply checks that keyTimes is not empty. Previously,
splinesCount was set to be m_keySplines.size() + 1 in
SVGAnimationElement.cpp; this patch changes splinesCount to be equal
to m_keySplines.size() to make the logic easier to follow and to
match other checks in SVGAnimationElement::startedActiveInterval.
Source/WebCore:
Test: svg/animations/animate-keysplines-crash.html
* svg/SVGAnimationElement.cpp:
(WebCore::SVGAnimationElement::startedActiveInterval):
LayoutTests:
* svg/animations/animate-keysplines-crash-expected.txt: Added.
* svg/animations/animate-keysplines-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoresvgSVGAnimationElementcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/SVGAnimationElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestssvganimationsanimatekeysplinescrashexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestssvganimationsanimatekeysplinescrashhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash.html</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 (167228 => 167229)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog        2014-04-14 09:34:45 UTC (rev 167228)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog        2014-04-14 09:37:30 UTC (rev 167229)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-03-01 David Kilzer <ddkilzer@apple.com>
+
+ Ensure keySplines is valid in SMIL animations
+ <http://webkit.org/b/129547>
+ <rdar://problem/15676128>
+
+ Reviewed by Darin Adler.
+
+ Merged from Blink (patch by Philip Rogers):
+ https://src.chromium.org/viewvc/blink?revision=156452&view=revision
+ http://crbug.com/276111
+
+ This patch fixes a crash in SMIL animations when keySplines are not
+ specified. The SMIL spec is clear on this:
+ http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncCalcMode
+ "If there are any errors in the keyTimes specification (bad values,
+ too many or too few values), the animation will have no effect."
+
+ This patch simply checks that keyTimes is not empty. Previously,
+ splinesCount was set to be m_keySplines.size() + 1 in
+ SVGAnimationElement.cpp; this patch changes splinesCount to be equal
+ to m_keySplines.size() to make the logic easier to follow and to
+ match other checks in SVGAnimationElement::startedActiveInterval.
+
+ * svg/animations/animate-keysplines-crash-expected.txt: Added.
+ * svg/animations/animate-keysplines-crash.html: Added.
+
</ins><span class="cx"> 2014-02-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not dispatch change event twice in single step action
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestssvganimationsanimatekeysplinescrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash-expected.txt (0 => 167229)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash-expected.txt         (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash-expected.txt        2014-04-14 09:37:30 UTC (rev 167229)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestssvganimationsanimatekeysplinescrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash.html (0 => 167229)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash.html         (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/svg/animations/animate-keysplines-crash.html        2014-04-14 09:37:30 UTC (rev 167229)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<body>
+Test for crbug.com/276111: This test passes if it does not crash.
+<svg xmlns="http://www.w3.org/2000/svg">
+ <rect>
+ <animateMotion path="M 1 2Z" id="animateMotionElement" calcMode="spline" values="M 1 2Z; M3 4Z"/>
+ </rect>
+</svg>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+function removePathAndFinishTest() {
+ animateMotionElement.removeAttribute('path');
+ setTimeout(function() {
+ document.write("PASS");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+}
+
+setTimeout('removePathAndFinishTest()', 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (167228 => 167229)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog        2014-04-14 09:34:45 UTC (rev 167228)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog        2014-04-14 09:37:30 UTC (rev 167229)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-03-01 David Kilzer <ddkilzer@apple.com>
+
+ Ensure keySplines is valid in SMIL animations
+ <http://webkit.org/b/129547>
+ <rdar://problem/15676128>
+
+ Reviewed by Darin Adler.
+
+ Merged from Blink (patch by Philip Rogers):
+ https://src.chromium.org/viewvc/blink?revision=156452&view=revision
+ http://crbug.com/276111
+
+ This patch fixes a crash in SMIL animations when keySplines are not
+ specified. The SMIL spec is clear on this:
+ http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncCalcMode
+ "If there are any errors in the keyTimes specification (bad values,
+ too many or too few values), the animation will have no effect."
+
+ This patch simply checks that keyTimes is not empty. Previously,
+ splinesCount was set to be m_keySplines.size() + 1 in
+ SVGAnimationElement.cpp; this patch changes splinesCount to be equal
+ to m_keySplines.size() to make the logic easier to follow and to
+ match other checks in SVGAnimationElement::startedActiveInterval.
+
+ Test: svg/animations/animate-keysplines-crash.html
+
+ * svg/SVGAnimationElement.cpp:
+ (WebCore::SVGAnimationElement::startedActiveInterval):
+
</ins><span class="cx"> 2014-02-28 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Properly clear m_logicallyLastRun to remove use-after-free possibility
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoresvgSVGAnimationElementcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/SVGAnimationElement.cpp (167228 => 167229)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/SVGAnimationElement.cpp        2014-04-14 09:34:45 UTC (rev 167228)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/svg/SVGAnimationElement.cpp        2014-04-14 09:37:30 UTC (rev 167229)
</span><span class="lines">@@ -560,10 +560,11 @@
</span><span class="cx"> AnimationMode animationMode = this->animationMode();
</span><span class="cx"> CalcMode calcMode = this->calcMode();
</span><span class="cx"> if (calcMode == CalcModeSpline) {
</span><del>- unsigned splinesCount = m_keySplines.size() + 1;
- if ((fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != splinesCount)
- || (animationMode == ValuesAnimation && m_values.size() != splinesCount)
- || (fastHasAttribute(SVGNames::keyTimesAttr) && m_keyTimes.size() != splinesCount))
</del><ins>+ unsigned splinesCount = m_keySplines.size();
+ if (!splinesCount
+ || (fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() - 1 != splinesCount)
+ || (animationMode == ValuesAnimation && m_values.size() - 1 != splinesCount)
+ || (fastHasAttribute(SVGNames::keyTimesAttr) && m_keyTimes.size() - 1 != splinesCount))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>