Mesa (mesa_7_5_branch): mesa: 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: d18c57aaeac37cde0cb551191ecd3c3a56a0ffba
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d18c57aaeac37cde0cb551191ecd3c3a56a0ffba

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

mesa: added null ptr check in Fake_glXCreatePixmap()

Fixes segfault in progs/xdemos/glxgears_pixmap.c

---

 src/mesa/drivers/x11/fakeglx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 3b004a3..34e0b8b 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -2218,7 +2218,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