Fixed null dereference when null passed as attribute list to eglCreateContext.

I tested that the samples still work and that they fail as expected, but do not crash, if the attribute list argument is null. Review URL: http://codereview.appspot.com/2725042 git-svn-id: https://angleproject.googlecode.com/svn/trunk@471 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixed null dereference when null passed as attribute list to eglCreateContext.
24e39699 · apatrick@chromium.org · 91ed1494 · 24e39699
Commit 24e39699 authored Nov 01, 2010 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

libEGL.cpp src/libEGL/libEGL.cpp +10 -7

No files found.
--- a/src/libEGL/libEGL.cpp
+++ b/src/libEGL/libEGL.cpp
@@ -774,15 +774,18 @@ EGLContext __stdcall eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLConte
    {
        // Get the requested client version (default is 1) and check it is two.
        EGLint client_version = 1;
-        for (const EGLint* attribute = attrib_list; attribute[0] != EGL_NONE; attribute += 2)
+        if (attrib_list)
        {
-            if (attribute[0] == EGL_CONTEXT_CLIENT_VERSION)
-            {
-                client_version = attribute[1];
-            }
-            else
+            for (const EGLint* attribute = attrib_list; attribute[0] != EGL_NONE; attribute += 2)
            {
-                return error(EGL_BAD_ATTRIBUTE, EGL_NO_CONTEXT);
+                if (attribute[0] == EGL_CONTEXT_CLIENT_VERSION)
+                {
+                    client_version = attribute[1];
+                }
+                else
+                {
+                    return error(EGL_BAD_ATTRIBUTE, EGL_NO_CONTEXT);
+                }
            }
        }