<!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>[187261] branches/safari-600.8-branch</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/187261">187261</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 15:19:31 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187189">r187189</a>. rdar://problem/21707927</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6008branchLayoutTestsChangeLog">branches/safari-600.8-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebCoreChangeLog">branches/safari-600.8-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6008branchLayoutTestsfastcanvaswebgloutofboundssimulatedvertexAttrib0drawArraysexpectedtxt">branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt</a></li>
<li><a href="#branchessafari6008branchLayoutTestsfastcanvaswebgloutofboundssimulatedvertexAttrib0drawArrayshtml">branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6008branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (187260 => 187261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-23 22:18:42 UTC (rev 187260)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-23 22:19:31 UTC (rev 187261)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-07-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r187189.
+
+ 2015-07-23 Dean Jackson <dino@apple.com>
+
+ Out of bounds in WebGLRenderingContext::simulateVertexAttrib0
+ https://bugs.webkit.org/show_bug.cgi?id=147176
+ <rdar://problem/21567767>
+
+ Reviewed by Oliver Hunt.
+
+ * fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt: Added.
+ * fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html: Added.
+
</ins><span class="cx"> 2015-07-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip a couple of region selection tests.
</span></span></pre></div>
<a id="branchessafari6008branchLayoutTestsfastcanvaswebgloutofboundssimulatedvertexAttrib0drawArraysexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt (0 => 187261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays-expected.txt 2015-07-23 22:19:31 UTC (rev 187261)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+CONSOLE MESSAGE: line 32: WebGL: INVALID_OPERATION: drawArrays: attempt to access outside the bounds of the simulated vertexAttrib0 array
+
</ins></span></pre></div>
<a id="branchessafari6008branchLayoutTestsfastcanvaswebgloutofboundssimulatedvertexAttrib0drawArrayshtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html (0 => 187261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html 2015-07-23 22:19:31 UTC (rev 187261)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<script>
+
+if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ testRunner.overridePreference("WebKitWebGLEnabled", "1");
+}
+
+function createShader(str, type) {
+ var shader = gl.createShader(type);
+ gl.shaderSource(shader, str);
+ gl.compileShader(shader);
+ return shader;
+}
+
+function createProgram(vstr, fstr) {
+ var program = gl.createProgram();
+ var vshader = createShader(vstr, gl.VERTEX_SHADER);
+ var fshader = createShader(fstr, gl.FRAGMENT_SHADER);
+ gl.attachShader(program, vshader);
+ gl.attachShader(program, fshader);
+ gl.linkProgram(program);
+ return program;
+}
+
+var canvas = document.createElement("canvas");
+var gl = canvas.getContext("webgl");
+
+var vs = 'attribute vec2 pos; void main() { gl_Position = vec4(pos, 0, 1); }';
+var fs = 'precision mediump float; void main() { gl_FragColor = vec4(0,0.8,0,1); }';
+var program = createProgram(vs, fs);
+gl.useProgram(program);
+gl.drawArrays(0, 0, 0x40000000);
+</script>
</ins></span></pre></div>
<a id="branchessafari6008branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (187260 => 187261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-23 22:18:42 UTC (rev 187260)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-23 22:19:31 UTC (rev 187261)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r187189.
+
+ 2015-07-23 Dean Jackson <dino@apple.com>
+
+ Out of bounds in WebGLRenderingContext::simulateVertexAttrib0
+ https://bugs.webkit.org/show_bug.cgi?id=147176
+ <rdar://problem/21567767>
+
+ Reviewed by Oliver Hunt.
+
+ Test: fast/canvas/webgl/out-of-bounds-simulated-vertexAttrib0-drawArrays.html
+
+ Add overflow checking for the drawing calls, specifically the way
+ they may simulate vertexAttrib0.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::validateDrawArrays): Call new validation method.
+ (WebCore::WebGLRenderingContextBase::validateDrawElements): Ditto.
+ (WebCore::WebGLRenderingContextBase::validateSimulatedVertexAttrib0): New method that
+ validates the parameters used to create the simulated attribute.
+ (WebCore::WebGLRenderingContextBase::simulateVertexAttrib0): No need to do overflow
+ checking here now that the validation method does it for us.
+ (WebCore::WebGLRenderingContextBase::validateVertexAttributes): Deleted.
+ * html/canvas/WebGLRenderingContextBase.h: Add new validation method.
+
</ins><span class="cx"> 2015-07-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186863. rdar://problem/21714843
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (187260 => 187261)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-07-23 22:18:42 UTC (rev 187260)
+++ branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2015-07-23 22:19:31 UTC (rev 187261)
</span><span class="lines">@@ -1708,7 +1708,6 @@
</span><span class="cx"> if (elementCount <= 0)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Look in each consumed vertex attrib (by the current program).
</span><span class="cx"> bool sawNonInstancedAttrib = false;
</span><span class="cx"> bool sawEnabledAttrib = false;
</span><span class="lines">@@ -1793,6 +1792,10 @@
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "attempt to access out of bounds arrays");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+ if (!validateSimulatedVertexAttrib0(checkedSum.unsafeGet() - 1)) {
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "attempt to access outside the bounds of the simulated vertexAttrib0 array");
+ return false;
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> if (!validateVertexAttributes(0)) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "attribs not setup correctly");
</span><span class="lines">@@ -1873,6 +1876,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (!validateSimulatedVertexAttrib0(numElements)) {
+ synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "attempt to access outside the bounds of the simulated vertexAttrib0 array");
+ return false;
+ }
+
</ins><span class="cx"> } else {
</span><span class="cx"> if (!validateVertexAttributes(0)) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "attribs not setup correctly");
</span><span class="lines">@@ -4669,36 +4678,69 @@
</span><span class="cx"> m_vertexAttrib0UsedBefore = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebGLRenderingContextBase::validateSimulatedVertexAttrib0(GC3Dsizei numVertex)
+{
+ if (numVertex < 0)
+ return false;
+
+ if (!m_currentProgram)
+ return true;
+
+ bool usingVertexAttrib0 = m_currentProgram->isUsingVertexAttrib0();
+ if (!usingVertexAttrib0)
+ return true;
+
+ auto& state = m_boundVertexArrayObject->getVertexAttribState(0);
+ if (state.enabled)
+ return true;
+
+ Checked<GC3Dsizei, RecordOverflow> bufferSize(numVertex);
+ bufferSize += 1;
+ bufferSize *= Checked<GC3Dsizei>(4);
+ Checked<GC3Dsizeiptr, RecordOverflow> bufferDataSize(bufferSize);
+ bufferDataSize *= Checked<GC3Dsizeiptr>(sizeof(GC3Dfloat));
+ return !bufferDataSize.hasOverflowed();
+}
+
</ins><span class="cx"> bool WebGLRenderingContextBase::simulateVertexAttrib0(GC3Dsizei numVertex)
</span><span class="cx"> {
</span><del>- const WebGLVertexArrayObjectBase::VertexAttribState& state = m_boundVertexArrayObject->getVertexAttribState(0);
- const VertexAttribValue& attribValue = m_vertexAttribValue[0];
</del><span class="cx"> if (!m_currentProgram)
</span><span class="cx"> return false;
</span><span class="cx"> bool usingVertexAttrib0 = m_currentProgram->isUsingVertexAttrib0();
</span><span class="cx"> if (usingVertexAttrib0)
</span><span class="cx"> m_vertexAttrib0UsedBefore = true;
</span><ins>+
+ auto& state = m_boundVertexArrayObject->getVertexAttribState(0);
</ins><span class="cx"> if (state.enabled && usingVertexAttrib0)
</span><span class="cx"> return false;
</span><span class="cx"> if (!usingVertexAttrib0 && !m_vertexAttrib0UsedBefore)
</span><span class="cx"> return false;
</span><span class="cx"> m_vertexAttrib0UsedBefore = true;
</span><span class="cx"> m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_vertexAttrib0Buffer->object());
</span><del>- Checked<GC3Dsizeiptr, RecordOverflow> bufferDataSize = (numVertex + 1) * 4 * sizeof(GC3Dfloat);
- if (bufferDataSize.hasOverflowed())
- return false;
</del><ins>+
+ Checked<GC3Dsizei> bufferSize(numVertex);
+ bufferSize += 1;
+ bufferSize *= Checked<GC3Dsizei>(4);
+
+ Checked<GC3Dsizeiptr> bufferDataSize(bufferSize);
+ bufferDataSize *= Checked<GC3Dsizeiptr>(sizeof(GC3Dfloat));
+
</ins><span class="cx"> if (bufferDataSize.unsafeGet() > m_vertexAttrib0BufferSize) {
</span><span class="cx"> m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, bufferDataSize.unsafeGet(), 0, GraphicsContext3D::DYNAMIC_DRAW);
</span><span class="cx"> m_vertexAttrib0BufferSize = bufferDataSize.unsafeGet();
</span><span class="cx"> m_forceAttrib0BufferRefill = true;
</span><span class="cx"> }
</span><ins>+
+ auto& attribValue = m_vertexAttribValue[0];
+
</ins><span class="cx"> if (usingVertexAttrib0
</span><span class="cx"> && (m_forceAttrib0BufferRefill
</span><span class="cx"> || attribValue.value[0] != m_vertexAttrib0BufferValue[0]
</span><span class="cx"> || attribValue.value[1] != m_vertexAttrib0BufferValue[1]
</span><span class="cx"> || attribValue.value[2] != m_vertexAttrib0BufferValue[2]
</span><span class="cx"> || attribValue.value[3] != m_vertexAttrib0BufferValue[3])) {
</span><del>- auto bufferData = std::make_unique<GC3Dfloat[]>((numVertex + 1) * 4);
</del><ins>+
+ auto bufferData = std::make_unique<GC3Dfloat[]>(bufferSize.unsafeGet());
</ins><span class="cx"> for (GC3Dsizei ii = 0; ii < numVertex + 1; ++ii) {
</span><span class="cx"> bufferData[ii * 4] = attribValue.value[0];
</span><span class="cx"> bufferData[ii * 4 + 1] = attribValue.value[1];
</span></span></pre>
</div>
</div>
</body>
</html>