commit 63108c34ec181e923b68ee840bb7960f205466a7
author Mathias Agopian <mathias@google.com> Fri Sep 06 13:36:49 2013 -0700
committer Mathias Agopian <mathias@google.com> Fri Sep 06 13:36:49 2013 -0700
tree c75c6e0efed718bc194d18a8cd18690b802eba7f
parent 77414216cde4d131eb09454d81dab30e408e4e7a

fix a possible null dereference when eglMakeCurrent() fails

Bug: 10648797
Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 9d792fb..d3bc14a 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -745,7 +745,8 @@
         }
     } else {
         // this will ALOGE the error
-        result = setError(c->cnx->egl.eglGetError(), EGL_FALSE);
+        egl_connection_t* const cnx = &gEGLImpl;
+        result = setError(cnx->egl.eglGetError(), EGL_FALSE);
     }
     return result;
 }