Merge "frameworks/base/opengl: Add NULL check"

This commit is contained in:
Jean-Baptiste Queru
2010-08-16 08:57:29 -07:00
committed by Android Code Review

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