commit c5508d6e6afe2a9faf14c251ed18a44fd1cfbdf0
author Geoff Lang <geofflang@chromium.org> Fri Feb 10 14:58:38 2017 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Feb 13 16:38:14 2017 +0000
tree 243e2a07eb3a4514b44a2e25bf3ee264e9e6253f
parent 5f45e7c34cd4c383a0d5826391f2302784354555

Validate that the format is compressed before calculating data size.

glCompressedTexImage3D was missing a check that the format was valid
before trying to compute the expected data size.  This lead to an
assertion failure in the size computation code.

BUG=602737

Change-Id: I74e6ced082e78396a0af92317fb1c0098299a026
Reviewed-on: https://chromium-review.googlesource.com/441185
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES3.cpp

diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index cf368e9..e2384aa 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -1621,6 +1621,12 @@
     }
 
     const InternalFormat &formatInfo = GetInternalFormatInfo(format);
+    if (!formatInfo.compressed)
+    {
+        context->handleError(Error(GL_INVALID_ENUM, "Not a valid compressed texture format"));
+        return false;
+    }
+
     auto blockSizeOrErr =
         formatInfo.computeCompressedImageSize(GL_UNSIGNED_BYTE, gl::Extents(width, height, depth));
     if (blockSizeOrErr.isError())