diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-06 17:15:26 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-12-19 14:55:30 -0800 |
commit | 7c2f1160c23970929a2846d210357447d07ff5f0 (patch) | |
tree | 5f855b519cd48397d12ea8aa99d51dba367ef54a /src/glx/glxcmds.c | |
parent | c4a8c54c3bb31547cba57702ffea99293afef522 (diff) | |
download | external_mesa3d-7c2f1160c23970929a2846d210357447d07ff5f0.zip external_mesa3d-7c2f1160c23970929a2846d210357447d07ff5f0.tar.gz external_mesa3d-7c2f1160c23970929a2846d210357447d07ff5f0.tar.bz2 |
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@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/glx/glxcmds.c')
-rw-r--r-- | 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; |