commit 3feb3ff505555879206ced2b2dde768a4df1f7a2
author Geoff Lang <geofflang@chromium.org> Wed Oct 26 10:57:45 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Oct 26 21:10:45 2016 +0000
tree 43f0c76bdcc8c68fdc9828d15f58dfeca716e1d3
parent 449a803040d9a6c44fc88c4d91b136292791e326

Fix handling of null data pointers for robust tex image calls.

BUG=angleproject:1354

Change-Id: I596ebd6d8d4d500942eeb31629113b0686933531
Reviewed-on: https://chromium-review.googlesource.com/403537
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index a45e1f2..4af40ca 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1565,9 +1565,10 @@
         {
             context->handleError(
                 Error(GL_INVALID_OPERATION, "imageSize must be 0 if no texture data is provided."));
+            return false;
         }
 
-        if (endByte > static_cast<GLuint>(imageSize))
+        if (pixels != nullptr && endByte > static_cast<GLuint>(imageSize))
         {
             context->handleError(
                 Error(GL_INVALID_OPERATION, "imageSize must be at least %u.", endByte));