<!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>[211935] 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/211935">211935</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-09 00:54:46 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208628">r208628</a> - Neutered ArrayBuffers are not properly serialized
https://bugs.webkit.org/show_bug.cgi?id=164647
<rdar://problem/29213490>
Reviewed by David Kilzer.
Source/WebCore:
Correct binding logic to handle ImageBuffers being deserialized from neutered ArrayBuffers.
Test: fast/canvas/neutered-imagedata.html
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneDeserializer::readTerminal):
LayoutTests:
* fast/canvas/neutered-imagedata-expected.txt: Added.
* fast/canvas/neutered-imagedata.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="#releasesWebKitGTKwebkit214SourceWebCorebindingsjsSerializedScriptValuecpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastcanvasneuteredimagedataexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastcanvasneuteredimagedatahtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata.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 (211934 => 211935)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-02-09 08:54:34 UTC (rev 211934)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2017-02-09 08:54:46 UTC (rev 211935)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-11 Brent Fulgham <bfulgham@apple.com>
+
+ Neutered ArrayBuffers are not properly serialized
+ https://bugs.webkit.org/show_bug.cgi?id=164647
+ <rdar://problem/29213490>
+
+ Reviewed by David Kilzer.
+
+ * fast/canvas/neutered-imagedata-expected.txt: Added.
+ * fast/canvas/neutered-imagedata.html: Added.
+
</ins><span class="cx"> 2016-11-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Clear track client when removing a track
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastcanvasneuteredimagedataexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata-expected.txt (0 => 211935)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata-expected.txt 2017-02-09 08:54:46 UTC (rev 211935)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that serialized image buffers account for neutered state.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Found only zeros.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastcanvasneuteredimagedatahtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata.html (0 => 211935)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/canvas/neutered-imagedata.html 2017-02-09 08:54:46 UTC (rev 211935)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script>
+description('Tests that serialized image buffers account for neutered state.');
+
+window.jsTestIsAsync = true;
+
+function checkState(state) {
+ var elementCount = state.width * state.height;
+
+ for (var i = 0; i < elementCount; ++i) {
+ if (state.data[i] != 0) {
+ testFailed("Found non-zero data.");
+ finishJSTest();
+ return;
+ }
+ }
+
+ testPassed("Found only zeros.");
+ finishJSTest();
+}
+
+function runTest() {
+ if (window.testRunner) {
+ testRunner.dumpAsText(true);
+ testRunner.waitUntilDone();
+ }
+
+ var id = new ImageData(1, 256);
+
+ // This will neuter the data buffer.
+ postMessage("", "*", [id.data.buffer]);
+
+ history.pushState(id, "");
+
+ setTimeout(function() {
+ checkState(history.state);
+ }, 0);
+}
+</script>
+</head>
+<body onload="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (211934 => 211935)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-09 08:54:34 UTC (rev 211934)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-09 08:54:46 UTC (rev 211935)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-11 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix after r208628
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneDeserializer::readTerminal): Cast pointer arithmetic to
+ uint32_t to avoid warning.
+
+2016-11-11 Brent Fulgham <bfulgham@apple.com>
+
+ Neutered ArrayBuffers are not properly serialized
+ https://bugs.webkit.org/show_bug.cgi?id=164647
+ <rdar://problem/29213490>
+
+ Reviewed by David Kilzer.
+
+ Correct binding logic to handle ImageBuffers being deserialized from neutered ArrayBuffers.
+
+ Test: fast/canvas/neutered-imagedata.html
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneDeserializer::readTerminal):
+
</ins><span class="cx"> 2016-11-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Clear track client when removing a track
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/SerializedScriptValue.cpp (211934 => 211935)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2017-02-09 08:54:34 UTC (rev 211934)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2017-02-09 08:54:46 UTC (rev 211935)
</span><span class="lines">@@ -2274,7 +2274,7 @@
</span><span class="cx"> uint32_t length;
</span><span class="cx"> if (!read(length))
</span><span class="cx"> return JSValue();
</span><del>- if (m_end < ((uint8_t*)0) + length || m_ptr > m_end - length) {
</del><ins>+ if (static_cast<uint32_t>(m_end - m_ptr) < length) {
</ins><span class="cx"> fail();
</span><span class="cx"> return JSValue();
</span><span class="cx"> }
</span><span class="lines">@@ -2282,8 +2282,17 @@
</span><span class="cx"> m_ptr += length;
</span><span class="cx"> return jsNull();
</span><span class="cx"> }
</span><del>- RefPtr<ImageData> result = ImageData::create(IntSize(width, height));
- memcpy(result->data()->data(), m_ptr, length);
</del><ins>+ IntSize imageSize(width, height);
+ RELEASE_ASSERT(!length || (imageSize.area() * 4).unsafeGet() <= length);
+ RefPtr<ImageData> result = ImageData::create(imageSize);
+ if (!result) {
+ fail();
+ return JSValue();
+ }
+ if (length)
+ memcpy(result->data()->data(), m_ptr, length);
+ else
+ result->data()->zeroFill();
</ins><span class="cx"> m_ptr += length;
</span><span class="cx"> return getJSValue(result.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>