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

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

Fix handling of null data pointers for robust tex image calls.
3feb3ff5 · Geoff Lang · Commit Bot · 449a8030 · 3feb3ff5
Commit 3feb3ff5 authored Oct 26, 2016 by Geoff Lang Committed by Commit Bot Oct 26, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

validationES.cpp src/libANGLE/validationES.cpp +2 -1

No files found.
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1565,9 +1565,10 @@ bool ValidImageDataSize(ValidationContext *context,
        {
            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));