Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frameworks/base/opengl: Add NULL check

Browse Source 
Check for the validity of the attrs_list in eglChooseConfig before using
it. This avoids a crash during tests in which the attributes are NULL.

Change-Id: I1c0a46b505ae919e2454cfdce32f8dfc21ead247
This commit is contained in:
Naomi Luis
2010-04-22 18:04:31 -07:00
parent 0f0dd448ea
commit 184d50f95b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opengl/libs/EGL/egl.cpp
View File

@@ -843,10 +843,13 @@ EGLBoolean eglChooseConfig( EGLDisplay dpy, const EGLint *attrib_list,
EGLint patch_index = -1;
GLint attr;
size_t size = 0;
while ((attr=attrib_list[size]) != EGL_NONE) {
if (attr == EGL_CONFIG_ID)
patch_index = size;
size += 2;
if (attrib_list != NULL) {
while ((attr=attrib_list[size]) != EGL_NONE) {
if (attr == EGL_CONFIG_ID)
patch_index = size;
size += 2;
}
}
if (patch_index >= 0) {
size += 2; // we need copy the sentinel as well