<!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>[186506] branches/safari-600.1.4.17-branch/Source/WebCore</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/186506">186506</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 09:41:39 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186380">r186380</a>. rdar://problem/21708281</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchSourceWebCoreChangeLog">branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp">branches/safari-600.1.4.17-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (186505 => 186506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-08 16:41:35 UTC (rev 186505)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-08 16:41:39 UTC (rev 186506)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-07-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186380. rdar://problem/21708281
+
+ 2015-07-06 Dean Jackson <dino@apple.com>
+
+ Memory corruption in WebGLRenderingContext::simulateVertexAttrib0
+ https://bugs.webkit.org/show_bug.cgi?id=146652
+ <rdar://problem/21567767>
+
+ Reviewed by Brent Fulgham.
+
+ The expression "(numVertex + 1) * 4 * sizeof(GC3Dfloat)" could potentially
+ overflow. Make it use checked arithmetic.
+
+ I couldn't make a test case that reliably exercised this.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::simulateVertexAttrib0): Used Checked<GC3Dsizeiptr>
+ for calculating the size of the buffer.
+
+2015-07-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r185848. rdar://problem/21708274
</span><span class="cx">
</span><span class="cx"> 2015-06-22 Michael Catanzaro <mcatanzaro@igalia.com>
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (186505 => 186506)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-07-08 16:41:35 UTC (rev 186505)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-07-08 16:41:39 UTC (rev 186506)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
</span><span class="cx"> * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><del>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/TypedArrayInlines.h>
</span><span class="cx"> #include <runtime/Uint32Array.h>
</span><ins>+#include <wtf/CheckedArithmetic.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -538,7 +539,7 @@
</span><span class="cx"> m_stencilFuncMaskBack = 0xFFFFFFFF;
</span><span class="cx"> m_layerCleared = false;
</span><span class="cx"> m_numGLErrorsToConsoleAllowed = maxGLErrorsAllowedToConsole;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_clearColor[0] = m_clearColor[1] = m_clearColor[2] = m_clearColor[3] = 0;
</span><span class="cx"> m_scissorEnabled = false;
</span><span class="cx"> m_clearDepth = 1;
</span><span class="lines">@@ -553,7 +554,7 @@
</span><span class="cx"> GC3Dint numVertexAttribs = 0;
</span><span class="cx"> m_context->getIntegerv(GraphicsContext3D::MAX_VERTEX_ATTRIBS, &numVertexAttribs);
</span><span class="cx"> m_maxVertexAttribs = numVertexAttribs;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_maxTextureSize = 0;
</span><span class="cx"> m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_maxTextureSize);
</span><span class="cx"> m_maxTextureLevel = WebGLTexture::computeLevelCount(m_maxTextureSize, m_maxTextureSize);
</span><span class="lines">@@ -574,7 +575,7 @@
</span><span class="cx"> m_defaultVertexArrayObject = WebGLVertexArrayObjectOES::create(this, WebGLVertexArrayObjectOES::VaoTypeDefault);
</span><span class="cx"> addContextObject(m_defaultVertexArrayObject.get());
</span><span class="cx"> m_boundVertexArrayObject = m_defaultVertexArrayObject;
</span><del>-
</del><ins>+
</ins><span class="cx"> m_vertexAttribValue.resize(m_maxVertexAttribs);
</span><span class="cx">
</span><span class="cx"> if (!isGLES2NPOTStrict())
</span><span class="lines">@@ -1768,7 +1769,7 @@
</span><span class="cx"> bool WebGLRenderingContext::validateElementArraySize(GC3Dsizei count, GC3Denum type, GC3Dintptr offset)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<WebGLBuffer> elementArrayBuffer = m_boundVertexArrayObject->getElementArrayBuffer();
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!elementArrayBuffer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1812,7 +1813,7 @@
</span><span class="cx"> // array buffers have enough elements to satisfy that maximum
</span><span class="cx"> // index, skips the expensive per-draw-call iteration in
</span><span class="cx"> // validateIndexArrayPrecise.
</span><del>-
</del><ins>+
</ins><span class="cx"> RefPtr<WebGLBuffer> elementArrayBuffer = m_boundVertexArrayObject->getElementArrayBuffer();
</span><span class="cx">
</span><span class="cx"> if (!elementArrayBuffer)
</span><span class="lines">@@ -1871,7 +1872,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(count >= 0 && offset >= 0);
</span><span class="cx"> unsigned lastIndex = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> RefPtr<WebGLBuffer> elementArrayBuffer = m_boundVertexArrayObject->getElementArrayBuffer();
</span><span class="cx">
</span><span class="cx"> if (!elementArrayBuffer)
</span><span class="lines">@@ -4126,7 +4127,7 @@
</span><span class="cx"> {
</span><span class="cx"> ec = 0;
</span><span class="cx"> Vector<uint8_t> data;
</span><del>- GraphicsContext3D::ImageExtractor imageExtractor(image, domSource, premultiplyAlpha, m_unpackColorspaceConversion == GraphicsContext3D::NONE);
</del><ins>+ GraphicsContext3D::ImageExtractor imageExtractor(image, domSource, premultiplyAlpha, m_unpackColorspaceConversion == GraphicsContext3D::NONE);
</ins><span class="cx"> if (!imageExtractor.extractSucceeded()) {
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "texSubImage2D", "bad image");
</span><span class="cx"> return;
</span><span class="lines">@@ -5874,7 +5875,7 @@
</span><span class="cx"> void WebGLRenderingContext::initVertexAttrib0()
</span><span class="cx"> {
</span><span class="cx"> WebGLVertexArrayObjectOES::VertexAttribState& state = m_boundVertexArrayObject->getVertexAttribState(0);
</span><del>-
</del><ins>+
</ins><span class="cx"> m_vertexAttrib0Buffer = createBuffer();
</span><span class="cx"> m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_vertexAttrib0Buffer->object());
</span><span class="cx"> m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, 0, GraphicsContext3D::DYNAMIC_DRAW);
</span><span class="lines">@@ -5906,10 +5907,12 @@
</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>- GC3Dsizeiptr bufferDataSize = (numVertex + 1) * 4 * sizeof(GC3Dfloat);
- if (bufferDataSize > m_vertexAttrib0BufferSize) {
- m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, bufferDataSize, 0, GraphicsContext3D::DYNAMIC_DRAW);
- m_vertexAttrib0BufferSize = bufferDataSize;
</del><ins>+ Checked<GC3Dsizeiptr, RecordOverflow> bufferDataSize = (numVertex + 1) * 4 * sizeof(GC3Dfloat);
+ if (bufferDataSize.hasOverflowed())
+ return false;
+ if (bufferDataSize.unsafeGet() > m_vertexAttrib0BufferSize) {
+ m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, bufferDataSize.unsafeGet(), 0, GraphicsContext3D::DYNAMIC_DRAW);
+ m_vertexAttrib0BufferSize = bufferDataSize.unsafeGet();
</ins><span class="cx"> m_forceAttrib0BufferRefill = true;
</span><span class="cx"> }
</span><span class="cx"> if (usingVertexAttrib0
</span><span class="lines">@@ -5930,7 +5933,7 @@
</span><span class="cx"> m_vertexAttrib0BufferValue[2] = attribValue.value[2];
</span><span class="cx"> m_vertexAttrib0BufferValue[3] = attribValue.value[3];
</span><span class="cx"> m_forceAttrib0BufferRefill = false;
</span><del>- m_context->bufferSubData(GraphicsContext3D::ARRAY_BUFFER, 0, bufferDataSize, bufferData.get());
</del><ins>+ m_context->bufferSubData(GraphicsContext3D::ARRAY_BUFFER, 0, bufferDataSize.unsafeGet(), bufferData.get());
</ins><span class="cx"> }
</span><span class="cx"> m_context->vertexAttribPointer(0, 4, GraphicsContext3D::FLOAT, 0, 0, 0);
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>