OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79b77ec
)
GlES2: Add NULL check
author
Anshuman Dani
<adani@codeaurora.org>
Tue, 5 Nov 2013 15:34:00 +0000
(21:04 +0530)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Mon, 3 Feb 2014 14:26:26 +0000
(22:26 +0800)
Check for NULL before calling thread specific glGetString.
CRs-fixed: 569609
Change-Id: Ifee8257152ba7ca7a05df5d7b113171b71d16c82
opengl/libs/GLES2/gl2.cpp
patch
|
blob
|
history
diff --git
a/opengl/libs/GLES2/gl2.cpp
b/opengl/libs/GLES2/gl2.cpp
index
a56f12d
..
441d468
100644
(file)
--- a/
opengl/libs/GLES2/gl2.cpp
+++ b/
opengl/libs/GLES2/gl2.cpp
@@
-163,7
+163,7
@@
const GLubyte * glGetString(GLenum name)
const GLubyte * ret = egl_get_string_for_current_context(name);
if (ret == NULL) {
gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl;
- ret = _c->glGetString(name);
+
if(_c)
ret = _c->glGetString(name);
}
return ret;
}