commit ccaf6bf34a357bf74accc08f70a42fc81df58248
author Jesse Hall <jessehall@google.com> Sat Jan 07 23:49:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 07 23:49:20 2017 +0000
tree bccb73e1b101d9d147b30c308993021660fb7c8c
parent ce80f3f4b00455ed3d1c34a34afe323472e481ca
parent 64990fc0b9a50cef8a749eadc5a7fde7d400c5ac

Merge "egl: Add NULL check for num_config parameter"
am: 64990fc0b9

Change-Id: I1000300a6ca1a5ee9013f68aacd8541cdfac48b1

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index bb20409..4e9cb5b 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -1459,6 +1459,9 @@
     if (egl_display_t::is_valid(dpy) == EGL_FALSE)
         return setError(EGL_BAD_DISPLAY, EGL_FALSE);
 
+    if (ggl_unlikely(num_config==NULL))
+        return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+
     GLint numConfigs = NELEM(gConfigs);
     if (!configs) {
         *num_config = numConfigs;
@@ -1478,8 +1481,8 @@
 {
     if (egl_display_t::is_valid(dpy) == EGL_FALSE)
         return setError(EGL_BAD_DISPLAY, EGL_FALSE);
-    
-    if (ggl_unlikely(num_config==0)) {
+
+    if (ggl_unlikely(num_config==NULL)) {
         return setError(EGL_BAD_PARAMETER, EGL_FALSE);
     }