commit e2e406c3a4fffc8be04631a6da3934cb180f4349
author Jamie Madill <jmadill@chromium.org> Thu Jun 02 13:04:10 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jun 03 15:52:02 2016 +0000
tree 075b263da0a636d8ef2b837bf17bd10dcb401994
parent 171e6a5806300855da8f6408703fa7ef4b0d4089

Add base::numerics for safe math and conversions.

This replaces are "IsUnsignedXXXSafe" family of methods.
Also add overflow checks to unpack block sizes.

BUG=angleproject:1397

Change-Id: Ib47be149b0486c70f795b0d0f8899441faac9340
Reviewed-on: https://chromium-review.googlesource.com/348062
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/FramebufferD3D.cpp b/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
index f038a59..a7c1b2a 100644
--- a/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
+++ b/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
@@ -242,8 +242,10 @@
 
     GLenum sizedInternalFormat = gl::GetSizedInternalFormat(format, type);
     const gl::InternalFormat &sizedFormatInfo = gl::GetInternalFormatInfo(sizedInternalFormat);
-    GLuint outputPitch =
-        sizedFormatInfo.computeRowPitch(type, area.width, packState.alignment, packState.rowLength);
+    GLuint outputPitch                        = 0;
+    ANGLE_TRY_RESULT(
+        sizedFormatInfo.computeRowPitch(type, area.width, packState.alignment, packState.rowLength),
+        outputPitch);
     GLsizei outputSkipBytes = sizedFormatInfo.computeSkipPixels(
         outputPitch, 0, 0, packState.skipRows, packState.skipPixels);