Mesa (master): glx: Don't segfault if xcb_glx_is_direct_reply returns NULL
Ian Romanick
idr at kemper.freedesktop.org
Mon Dec 19 22:56:28 UTC 2011
Module: Mesa
Branch: master
Commit: 7c2f1160c23970929a2846d210357447d07ff5f0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c2f1160c23970929a2846d210357447d07ff5f0
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Dec 6 17:15:26 2011 -0800
glx: Don't segfault if xcb_glx_is_direct_reply returns NULL
NOTE: This is a candidate for the 7.11 branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/glx/glxcmds.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index c8ec9c2..c29bc1c 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -594,7 +594,7 @@ __glXIsDirect(Display * dpy, GLXContextID contextID)
(c, contextID),
NULL);
- const Bool is_direct = reply->is_direct ? True : False;
+ const Bool is_direct = (reply != NULL && reply->is_direct) ? True : False;
free(reply);
return is_direct;
More information about the mesa-commit
mailing list