diff options
| author | Naomi Luis <nluis@codeaurora.org> | 2010-04-22 18:04:31 -0700 |
|---|---|---|
| committer | Naomi Luis <nluis@codeaurora.org> | 2010-08-05 12:53:24 -0700 |
| commit | 184d50f95bc47343b8a324bb6cce94d97b8956df (patch) | |
| tree | 392605e09f958ba6f174ef94c4f5998a29bcdeca | |
| parent | 0f0dd448ea54ddb760ed77e7d9167b7d7ad1b916 (diff) | |
| download | base-184d50f95bc47343b8a324bb6cce94d97b8956df.tar.gz | |
frameworks/base/opengl: Add NULL check
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
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 40317e7ed7c3..de740a36b05f 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -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 |