commit c51642b40f23b40c9cb2f0ecd30db8a45a6b3c53
author Geoff Lang <geofflang@chromium.org> Mon Nov 14 16:18:26 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Nov 15 17:39:11 2016 +0000
tree ac7e046290dcde9c8d96bf7cac816a1048055637
parent 399d1a17b2b7a5bdef4bd962ef37ca4716404992

Validate level exists for TexSubImage calls.

Before validating the texture format, verify that the texture level already
exists in glTexSubImage calls.

BUG=602737

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

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 39a0c80..1d7b894 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -368,10 +368,16 @@
 
     if (isSubImage)
     {
+        GLenum textureFormat = texture->getFormat(target, level).asSized();
+        if (textureFormat == GL_NONE)
+        {
+            context->handleError(Error(GL_INVALID_OPERATION, "Texture level does not exist."));
+            return false;
+        }
+
         if (format != GL_NONE)
         {
-            if (gl::GetSizedInternalFormat(format, type) !=
-                texture->getFormat(target, level).asSized())
+            if (gl::GetSizedInternalFormat(format, type) != textureFormat)
             {
                 context->handleError(Error(GL_INVALID_OPERATION));
                 return false;