summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-09-06 13:36:49 -0700
committerMathias Agopian <mathias@google.com>2013-09-06 13:36:49 -0700
commit63108c34ec181e923b68ee840bb7960f205466a7 (patch)
treec75c6e0efed718bc194d18a8cd18690b802eba7f /opengl
parent77414216cde4d131eb09454d81dab30e408e4e7a (diff)
downloadframeworks_native-63108c34ec181e923b68ee840bb7960f205466a7.zip
frameworks_native-63108c34ec181e923b68ee840bb7960f205466a7.tar.gz
frameworks_native-63108c34ec181e923b68ee840bb7960f205466a7.tar.bz2
fix a possible null dereference when eglMakeCurrent() fails
Bug: 10648797 Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libs/EGL/eglApi.cpp3
1 files changed, 2 insertions, 1 deletions
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 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw,
}
} 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;
}