Mesa (mesa_7_5_branch): st/glx: added null ptr check in Fake_glXCreatePixmap()

Brian Paul brianp at kemper.freedesktop.org
Wed Jun 17 14:39:34 UTC 2009


Module: Mesa
Branch: mesa_7_5_branch
Commit: 3705f48688d7d2c8d4ff5f108ff6b56e289d1967
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3705f48688d7d2c8d4ff5f108ff6b56e289d1967

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun 17 08:33:39 2009 -0600

st/glx: added null ptr check in Fake_glXCreatePixmap()

Fixes segfault in progs/xdemos/glxgears_pixmap.c

---

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

diff --git a/src/gallium/state_trackers/glx/xlib/fakeglx.c b/src/gallium/state_trackers/glx/xlib/fakeglx.c
index 65e7048..6df4c7d 100644
--- a/src/gallium/state_trackers/glx/xlib/fakeglx.c
+++ b/src/gallium/state_trackers/glx/xlib/fakeglx.c
@@ -1817,7 +1817,7 @@ Fake_glXCreatePixmap( Display *dpy, GLXFBConfig config, Pixmap pixmap,
    if (!dpy || !config || !pixmap)
       return 0;
 
-   for (attr = attribList; *attr; attr++) {
+   for (attr = attribList; attr && *attr; attr++) {
       switch (*attr) {
       case GLX_TEXTURE_FORMAT_EXT:
          attr++;




More information about the mesa-commit mailing list