commit 4dfed837cbbdf55d82b2a602d9f5806201f80fa7
author Shannon Woods <shannonwoods@chromium.org> Mon Mar 17 20:03:39 2014 -0400
committer Shannon Woods <shannonwoods@chromium.org> Tue Mar 18 20:43:32 2014 +0000
tree 02e7ada8f8f83d8edc5f2980ecae40f3b6a6e16c
parent 4251b75830f91df68df80a096a0713830c73b1cc

Validate target parameter in CopyTexImage calls before using to check mip level

Would cause UNREACHABLE to be triggered if target was invalid, and INVALID_VALUE to
be returned instead of INVALID_ENUM if it were the only erroneous argument.

Change-Id: I2606e77379fa2832a50b3a299e6474a4b2f68afa
Reviewed-on: https://chromium-review.googlesource.com/189701
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/validationES2.cpp

diff --git a/src/libGLESv2/validationES2.cpp b/src/libGLESv2/validationES2.cpp
index ea933ee..41246ee 100644
--- a/src/libGLESv2/validationES2.cpp
+++ b/src/libGLESv2/validationES2.cpp
@@ -457,6 +457,11 @@
                                        GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height,
                                        GLint border)
 {
+    if (!ValidTexture2DDestinationTarget(context, target))
+    {
+        return gl::error(GL_INVALID_ENUM, false);
+    }
+
     if (!gl::IsInternalTextureTarget(target, context->getClientVersion()))
     {
         return gl::error(GL_INVALID_ENUM, false);