commit 455ab58c09bb6ba76b264523c3cd28a1a68fb5fc
author Mathias Agopian <mathias@google.com> Fri Sep 06 15:06:41 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 06 15:06:41 2013 -0700
tree 65e8a51f8626769e4e3d07a99561986c43038385
parent 7390e04932dc1b588967d9951eeaf0d00e8a5a83
parent 63108c34ec181e923b68ee840bb7960f205466a7

am 63108c34: fix a possible null dereference when eglMakeCurrent() fails

* commit '63108c34ec181e923b68ee840bb7960f205466a7':
  fix a possible null dereference when eglMakeCurrent() fails

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;
 }