<!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>[204802] releases/WebKitGTK/webkit-2.12</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/204802">204802</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-23 04:03:00 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203729">r203729</a> - Infinite Canvas context save() causes WebKit to crash
https://bugs.webkit.org/show_bug.cgi?id=159586
<rdar://problem/26759984>
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2016-07-26
Reviewed by Simon Fraser.
Source/WebCore:
Limit the size of the canvas context state stack to 1024 * 16 saves. All
the saves which come after that limit will stay unrealized. The restore()
should not have any effect till there is no unrealized saves.
Test: fast/canvas/canvas-context-save-limit.html
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::realizeSaves):
(WebCore::CanvasRenderingContext2D::realizeSavesLoop):
* html/canvas/CanvasRenderingContext2D.h:
LayoutTests:
* fast/canvas/canvas-context-save-limit-expected.txt: Added.
* fast/canvas/canvas-context-save-limit.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorehtmlcanvasCanvasRenderingContext2Dh">releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcanvascanvascontextsavelimitexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcanvascanvascontextsavelimithtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204801 => 204802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 10:58:06 UTC (rev 204801)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 11:03:00 UTC (rev 204802)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Infinite Canvas context save() causes WebKit to crash
+ https://bugs.webkit.org/show_bug.cgi?id=159586
+ <rdar://problem/26759984>
+
+ Reviewed by Simon Fraser.
+
+ * fast/canvas/canvas-context-save-limit-expected.txt: Added.
+ * fast/canvas/canvas-context-save-limit.html: Added.
+
</ins><span class="cx"> 2016-08-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> marquee with "truespeed" animates at > 60fps, hogging CPU
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcanvascanvascontextsavelimitexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit-expected.txt (0 => 204802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit-expected.txt 2016-08-23 11:03:00 UTC (rev 204802)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+CONSOLE MESSAGE: line 29: CanvasRenderingContext2D.save() has been called without a matching restore() too many times. Ignoring save().
+CONSOLE MESSAGE: line 29: CanvasRenderingContext2D.save() has been called without a matching restore() too many times. Ignoring save().
+This test verifies that the size of CanvasRenderingContext2D state stack does not grow beyond a certain limit.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS ctx.fillStyle is "#ff0000"
+PASS ctx.fillStyle is "#0000ff"
+PASS ctx.fillStyle is "#00ff00"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcanvascanvascontextsavelimithtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit.html (0 => 204802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/canvas/canvas-context-save-limit.html 2016-08-23 11:03:00 UTC (rev 204802)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+ <canvas id="canvas"/>
+ <script>
+ description("This test verifies that the size of CanvasRenderingContext2D state stack does not grow beyond a certain limit.");
+ const RED = '#ff0000';
+ const GREEN = '#00ff00';
+ const BLUE = '#0000ff';
+ const SAVE_STACK_SIZE = 1024 * 16;
+ const MAX_SAVES = SAVE_STACK_SIZE - 1;
+
+ var c = document.getElementById("canvas");
+ var ctx = c.getContext("2d");
+
+ for (var i = 0; i < MAX_SAVES * 2; ++i) {
+ if (!i || i >= MAX_SAVES)
+ ctx.fillStyle = GREEN;
+ else if (i == MAX_SAVES - 1)
+ ctx.fillStyle = BLUE;
+ else
+ ctx.fillStyle = RED;
+ ctx.save();
+ }
+
+ ctx.fillStyle = RED;
+
+ for (var i = MAX_SAVES * 2 - 1; i >= 0; --i) {
+ ctx.restore();
+ if (i == MAX_SAVES * 2 - 1)
+ shouldBeEqualToString('ctx.fillStyle', RED);
+ else if (i == MAX_SAVES - 1)
+ shouldBeEqualToString('ctx.fillStyle', BLUE);
+ else if (!i)
+ shouldBeEqualToString('ctx.fillStyle', GREEN);
+ }
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204801 => 204802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 10:58:06 UTC (rev 204801)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 11:03:00 UTC (rev 204802)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-07-26 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Infinite Canvas context save() causes WebKit to crash
+ https://bugs.webkit.org/show_bug.cgi?id=159586
+ <rdar://problem/26759984>
+
+ Reviewed by Simon Fraser.
+
+ Limit the size of the canvas context state stack to 1024 * 16 saves. All
+ the saves which come after that limit will stay unrealized. The restore()
+ should not have any effect till there is no unrealized saves.
+
+ Test: fast/canvas/canvas-context-save-limit.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::realizeSaves):
+ (WebCore::CanvasRenderingContext2D::realizeSavesLoop):
+ * html/canvas/CanvasRenderingContext2D.h:
+
</ins><span class="cx"> 2016-08-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> DumpRenderTree crashed in com.apple.WebCore: WebCore::DOMWindow::resetDOMWindowProperties + 607
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (204801 => 204802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-08-23 10:58:06 UTC (rev 204801)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-08-23 11:03:00 UTC (rev 204802)
</span><span class="lines">@@ -350,6 +350,17 @@
</span><span class="cx"> context.drawBidiText(m_font, run, point, action);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CanvasRenderingContext2D::realizeSaves()
+{
+ if (m_unrealizedSaveCount)
+ realizeSavesLoop();
+
+ if (m_unrealizedSaveCount) {
+ static NeverDestroyed<String> consoleMessage(ASCIILiteral("CanvasRenderingContext2D.save() has been called without a matching restore() too many times. Ignoring save()."));
+ canvas()->document().addConsoleMessage(MessageSource::Rendering, MessageLevel::Error, consoleMessage);
+ }
+}
+
</ins><span class="cx"> void CanvasRenderingContext2D::realizeSavesLoop()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_unrealizedSaveCount);
</span><span class="lines">@@ -356,6 +367,8 @@
</span><span class="cx"> ASSERT(m_stateStack.size() >= 1);
</span><span class="cx"> GraphicsContext* context = drawingContext();
</span><span class="cx"> do {
</span><ins>+ if (m_stateStack.size() > MaxSaveCount)
+ break;
</ins><span class="cx"> m_stateStack.append(state());
</span><span class="cx"> if (context)
</span><span class="cx"> context->save();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (204801 => 204802)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-08-23 10:58:06 UTC (rev 204801)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-08-23 11:03:00 UTC (rev 204802)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> CanvasDidDrawApplyAll = 0xffffffff
</span><span class="cx"> };
</span><span class="cx">
</span><del>- State& modifiableState() { ASSERT(!m_unrealizedSaveCount); return m_stateStack.last(); }
</del><ins>+ State& modifiableState() { ASSERT(!m_unrealizedSaveCount || m_stateStack.size() >= MaxSaveCount); return m_stateStack.last(); }
</ins><span class="cx"> const State& state() const { return m_stateStack.last(); }
</span><span class="cx">
</span><span class="cx"> void applyLineDash() const;
</span><span class="lines">@@ -334,11 +334,7 @@
</span><span class="cx"> GraphicsContext* drawingContext() const;
</span><span class="cx">
</span><span class="cx"> void unwindStateStack();
</span><del>- void realizeSaves()
- {
- if (m_unrealizedSaveCount)
- realizeSavesLoop();
- }
</del><ins>+ void realizeSaves();
</ins><span class="cx"> void realizeSavesLoop();
</span><span class="cx">
</span><span class="cx"> void applyStrokePattern();
</span><span class="lines">@@ -394,6 +390,7 @@
</span><span class="cx"> virtual PlatformLayer* platformLayer() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ static const unsigned MaxSaveCount = 1024 * 16;
</ins><span class="cx"> Vector<State, 1> m_stateStack;
</span><span class="cx"> unsigned m_unrealizedSaveCount { 0 };
</span><span class="cx"> bool m_usesCSSCompatibilityParseMode;
</span></span></pre>
</div>
</div>
</body>
</html>