commit 496c02dfcb330cbdc95db8e0542247e75ff93b03
author Geoff Lang <geofflang@chromium.org> Thu Oct 20 11:38:11 2016 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 20 20:32:23 2016 +0000
tree 93519e1c5aa04d769533e38f2f439f634b784acc
parent 0a9661f2b4746a37942e9af5539b23f5fbd80013

Implement robust the GetBufferPointerv entry point.

BUG=angleproject:1354

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

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 1c578cf..a7b9f9a 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -3921,32 +3921,56 @@
                                                yoffset, 0, x, y, width, height, 0);
 }
 
-bool ValidateGetBufferPointervBase(Context *context, GLenum target, GLenum pname, void **params)
+bool ValidateGetBufferPointervBase(Context *context,
+                                   GLenum target,
+                                   GLenum pname,
+                                   GLsizei *length,
+                                   void **params)
 {
+    if (length)
+    {
+        *length = 0;
+    }
+
+    if (context->getClientMajorVersion() < 3 && !context->getExtensions().mapBuffer)
+    {
+        context->handleError(
+            Error(GL_INVALID_OPERATION,
+                  "Context does not support OpenGL ES 3.0 or GL_OES_map_buffer is not enabled."));
+        return false;
+    }
+
     if (!ValidBufferTarget(context, target))
     {
         context->handleError(Error(GL_INVALID_ENUM, "Buffer target not valid: 0x%X", target));
         return false;
     }
 
-    if (pname != GL_BUFFER_MAP_POINTER)
+    switch (pname)
     {
-        context->handleError(Error(GL_INVALID_ENUM, "pname not valid: 0x%X", pname));
-        return false;
-    }
+        case GL_BUFFER_MAP_POINTER:
+            break;
 
-    Buffer *buffer = context->getGLState().getTargetBuffer(target);
+        default:
+            context->handleError(Error(GL_INVALID_ENUM, "Unknown pname."));
+            return false;
+    }
 
     // GLES 3.0 section 2.10.1: "Attempts to attempts to modify or query buffer object state for a
     // target bound to zero generate an INVALID_OPERATION error."
     // GLES 3.1 section 6.6 explicitly specifies this error.
-    if (!buffer)
+    if (context->getGLState().getTargetBuffer(target) == nullptr)
     {
         context->handleError(
             Error(GL_INVALID_OPERATION, "Can not get pointer for reserved buffer name zero."));
         return false;
     }
 
+    if (length)
+    {
+        *length = 1;
+    }
+
     return true;
 }