commit 6dc7f360577000743f7314569991a7ef092a1cea
author Shannon Woods <shannonwoods@chromium.org> Wed Jun 25 21:12:02 2014 -0400
committer Shannon Woods <shannonwoods@chromium.org> Thu Jun 26 18:01:19 2014 +0000
tree 1a5fd01ca198f483fe7ecde762af4b866d5b28ff
parent 28bedaf892e4ca63aeae98a76b65744fe0191202

Fix null pointer dereference in glGetBufferPointerv

BUG=angle:687

Change-Id: If8f215d4a86332b9e6e791263bdeeb44b23a42a2
Reviewed-on: https://chromium-review.googlesource.com/205711
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index e7f2dc2..de3ede5 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -9896,8 +9896,10 @@
             {
                 *params = NULL;
             }
-
-            *params = buffer->getMapPointer();
+            else
+            {
+                *params = buffer->getMapPointer();
+            }
         }
     }
     catch (...)