Mesa (master): st/glx/xlib: check for null attrib_list in glXCreateContextAttribsARB()

Brian Paul brianp at kemper.freedesktop.org
Fri Dec 30 15:39:47 UTC 2011


Module: Mesa
Branch: master
Commit: 797960dbeca675d8966752bc7a201f311123f3d5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=797960dbeca675d8966752bc7a201f311123f3d5

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Dec 30 08:38:49 2011 -0700

st/glx/xlib: check for null attrib_list in glXCreateContextAttribsARB()

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=44234

---

 src/gallium/state_trackers/glx/xlib/glx_api.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index d978286..b68882b 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -2665,7 +2665,7 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
                                 GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB);
 
    /* parse attrib_list */
-   for (i = 0; !done && attrib_list[i]; i++) {
+   for (i = 0; !done && attrib_list && attrib_list[i]; i++) {
       switch (attrib_list[i]) {
       case GLX_CONTEXT_MAJOR_VERSION_ARB:
          majorVersion = attrib_list[++i];




More information about the mesa-commit mailing list