<!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>[202068] 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/202068">202068</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-06-14 15:47:34 -0700 (Tue, 14 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>decompose4 return value is unchecked, leading to potentially uninitialized data.
https://bugs.webkit.org/show_bug.cgi?id=158761
<rdar://problem/17526268>
Reviewed by Simon Fraser.
Source/WebCore:
WebCore::decompose4 could return early without initializing data.
I now initialize it, but I also started checking the return
value at all the call sites to make sure everything is sensible.
Test: transforms/undecomposable.html
* platform/graphics/transforms/PerspectiveTransformOperation.cpp:
(WebCore::PerspectiveTransformOperation::blend):
* platform/graphics/transforms/RotateTransformOperation.cpp:
(WebCore::RotateTransformOperation::blend):
* platform/graphics/transforms/TransformationMatrix.cpp:
(WebCore::decompose4):
(WebCore::TransformationMatrix::blend4):
* platform/graphics/transforms/TransformationMatrix.h:
LayoutTests:
* transforms/undecomposable-expected.txt: Added.
* transforms/undecomposable.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="#trunkSourceWebCoreplatformgraphicstransformsPerspectiveTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsRotateTransformOperationcpp">trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTeststransformsundecomposableexpectedtxt">trunk/LayoutTests/transforms/undecomposable-expected.txt</a></li>
<li><a href="#trunkLayoutTeststransformsundecomposablehtml">trunk/LayoutTests/transforms/undecomposable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202067 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-14 22:34:09 UTC (rev 202067)
+++ trunk/LayoutTests/ChangeLog 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-14 Dean Jackson <dino@apple.com>
+
+ decompose4 return value is unchecked, leading to potentially uninitialized data.
+ https://bugs.webkit.org/show_bug.cgi?id=158761
+ <rdar://problem/17526268>
+
+ Reviewed by Simon Fraser.
+
+ * transforms/undecomposable-expected.txt: Added.
+ * transforms/undecomposable.html: Added.
+
</ins><span class="cx"> 2016-06-14 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> The Array species constructor watchpoints should be created the first time they are needed rather than on creation
</span></span></pre></div>
<a id="trunkLayoutTeststransformsundecomposableexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/transforms/undecomposable-expected.txt (0 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transforms/undecomposable-expected.txt (rev 0)
+++ trunk/LayoutTests/transforms/undecomposable-expected.txt 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins><span class="cx">Property changes on: trunk/LayoutTests/transforms/undecomposable-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTeststransformsundecomposablehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/transforms/undecomposable.html (0 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transforms/undecomposable.html (rev 0)
+++ trunk/LayoutTests/transforms/undecomposable.html 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<script>
+if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ window.testRunner.waitUntilDone();
+
+ window.addEventListener("load", function () {
+ document.querySelector(".box").addEventListener("animationend", function () {
+ window.testRunner.notifyDone();
+ }, false);
+ }, false);
+}
+</script>
+<style>
+.box {
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+ animation-name: funky;
+ animation-duration: 100ms;
+}
+
+@keyframes funky {
+ from {
+ transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0);
+ }
+ to {
+ transform: matrix3d(2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2);
+ }
+}
+</style>
+<div class="box"></div>
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/transforms/undecomposable.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202067 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-14 22:34:09 UTC (rev 202067)
+++ trunk/Source/WebCore/ChangeLog 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-06-14 Dean Jackson <dino@apple.com>
+
+ decompose4 return value is unchecked, leading to potentially uninitialized data.
+ https://bugs.webkit.org/show_bug.cgi?id=158761
+ <rdar://problem/17526268>
+
+ Reviewed by Simon Fraser.
+
+ WebCore::decompose4 could return early without initializing data.
+ I now initialize it, but I also started checking the return
+ value at all the call sites to make sure everything is sensible.
+
+ Test: transforms/undecomposable.html
+
+ * platform/graphics/transforms/PerspectiveTransformOperation.cpp:
+ (WebCore::PerspectiveTransformOperation::blend):
+ * platform/graphics/transforms/RotateTransformOperation.cpp:
+ (WebCore::RotateTransformOperation::blend):
+ * platform/graphics/transforms/TransformationMatrix.cpp:
+ (WebCore::decompose4):
+ (WebCore::TransformationMatrix::blend4):
+ * platform/graphics/transforms/TransformationMatrix.h:
+
</ins><span class="cx"> 2016-06-14 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the unprefixed version of the pseudo element ::placeholder
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsPerspectiveTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp (202067 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp 2016-06-14 22:34:09 UTC (rev 202067)
+++ trunk/Source/WebCore/platform/graphics/transforms/PerspectiveTransformOperation.cpp 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -60,11 +60,11 @@
</span><span class="cx"> toT.applyPerspective(floatValueForLength(toP, 1));
</span><span class="cx"> toT.blend(fromT, progress);
</span><span class="cx"> TransformationMatrix::Decomposed4Type decomp;
</span><del>- toT.decompose4(decomp);
-
- if (decomp.perspectiveZ) {
- double val = -1.0 / decomp.perspectiveZ;
- return PerspectiveTransformOperation::create(Length(clampToPositiveInteger(val), Fixed));
</del><ins>+ if (toT.decompose4(decomp)) {
+ if (decomp.perspectiveZ) {
+ double val = -1.0 / decomp.perspectiveZ;
+ return PerspectiveTransformOperation::create(Length(clampToPositiveInteger(val), Fixed));
+ }
</ins><span class="cx"> }
</span><span class="cx"> return PerspectiveTransformOperation::create(Length(0, Fixed));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsRotateTransformOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp (202067 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp 2016-06-14 22:34:09 UTC (rev 202067)
+++ trunk/Source/WebCore/platform/graphics/transforms/RotateTransformOperation.cpp 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -78,7 +78,8 @@
</span><span class="cx">
</span><span class="cx"> // Extract the result as a quaternion
</span><span class="cx"> TransformationMatrix::Decomposed4Type decomp;
</span><del>- toT.decompose4(decomp);
</del><ins>+ if (!toT.decompose4(decomp))
+ return RotateTransformOperation::create(m_x, m_y, m_z, m_angle - m_angle * progress, m_type);;
</ins><span class="cx">
</span><span class="cx"> // Convert that to Axis/Angle form
</span><span class="cx"> double x = -decomp.quaternionX;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp (202067 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-06-14 22:34:09 UTC (rev 202067)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -365,9 +365,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> int i, j;
</span><del>- for (i = 0; i < 4; i++)
</del><ins>+ for (i = 0; i < 4; i++) {
</ins><span class="cx"> for (j = 0; j < 4; j++)
</span><span class="cx"> localMatrix[i][j] /= localMatrix[3][3];
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // perspectiveMatrix is used to solve for perspective, but it also provides
</span><span class="cx"> // an easy way to test for singularity of the upper 3x3 component.
</span><span class="lines">@@ -1541,8 +1542,10 @@
</span><span class="cx"> {
</span><span class="cx"> Decomposed4Type fromDecomp;
</span><span class="cx"> Decomposed4Type toDecomp;
</span><del>- from.decompose4(fromDecomp);
- decompose4(toDecomp);
</del><ins>+ if (!from.decompose4(fromDecomp))
+ return;
+ if (!decompose4(toDecomp))
+ return;
</ins><span class="cx">
</span><span class="cx"> blendFloat(fromDecomp.scaleX, toDecomp.scaleX, progress);
</span><span class="cx"> blendFloat(fromDecomp.scaleY, toDecomp.scaleY, progress);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (202067 => 202068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-06-14 22:34:09 UTC (rev 202067)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-06-14 22:47:34 UTC (rev 202068)
</span><span class="lines">@@ -272,11 +272,23 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct Decomposed4Type {
</span><del>- double scaleX, scaleY, scaleZ;
- double skewXY, skewXZ, skewYZ;
- double quaternionX, quaternionY, quaternionZ, quaternionW;
- double translateX, translateY, translateZ;
- double perspectiveX, perspectiveY, perspectiveZ, perspectiveW;
</del><ins>+ double scaleX { 1 };
+ double scaleY { 1 };
+ double scaleZ { 1 };
+ double skewXY { 0 };
+ double skewXZ { 0 };
+ double skewYZ { 0 };
+ double quaternionX { 0 };
+ double quaternionY { 0 };
+ double quaternionZ { 0 };
+ double quaternionW { 0 };
+ double translateX { 0 };
+ double translateY { 0 };
+ double translateZ { 0 };
+ double perspectiveX { 0 };
+ double perspectiveY { 0 };
+ double perspectiveZ { 0 };
+ double perspectiveW { 1 };
</ins><span class="cx">
</span><span class="cx"> bool operator==(const Decomposed4Type& other) const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>