commit fb05264b5b0c5fb3f63e6b2ceb30b2e5ee7425c5
author Geoff Lang <geofflang@chromium.org> Tue Oct 24 13:42:09 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Nov 07 19:05:27 2017 +0000
tree f745af59fe27ade5a3a46d784a944de10ba5bd55
parent c9727f31b5093c381a423da8f0ffda85d929aaae

Disallow null pixel data for TexSubImage that have non-zero size.

BUG=angleproject:2055

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

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index a07227f..64cbb68 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -1140,6 +1140,13 @@
             context->handleError(InvalidValue());
             return false;
         }
+
+        if (width > 0 && height > 0 && pixels == nullptr &&
+            context->getGLState().getTargetBuffer(GL_PIXEL_UNPACK_BUFFER) == nullptr)
+        {
+            ANGLE_VALIDATION_ERR(context, InvalidValue(), PixelDataNull);
+            return false;
+        }
     }
     else
     {