diff options
| author | Brian Paul <brianp@vmware.com> | 2013-05-24 08:06:04 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-05-24 16:35:25 -0600 |
| commit | fd29e4acdae3a667e5b2519aa87ad457decb50c6 (patch) | |
| tree | 236e251f93f6d3ba082f1d5c5480ceabc804c7ea /src/gallium/state_trackers/glx | |
| parent | db4580cbdf66c587867130cb7b2e630ea247971e (diff) | |
| download | external_mesa3d-fd29e4acdae3a667e5b2519aa87ad457decb50c6.zip external_mesa3d-fd29e4acdae3a667e5b2519aa87ad457decb50c6.tar.gz external_mesa3d-fd29e4acdae3a667e5b2519aa87ad457decb50c6.tar.bz2 | |
st/glx: add null ctx check in glXDestroyContext()
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64934
NOTE: This is a candidate for the stable branches.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/state_trackers/glx')
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/glx_api.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index a66ebc8..c6dc134 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/state_trackers/glx/xlib/glx_api.c @@ -1353,16 +1353,18 @@ glXQueryExtension( Display *dpy, int *errorBase, int *eventBase ) PUBLIC void glXDestroyContext( Display *dpy, GLXContext ctx ) { - GLXContext glxCtx = ctx; - (void) dpy; - MakeCurrent_PrevContext = 0; - MakeCurrent_PrevDrawable = 0; - MakeCurrent_PrevReadable = 0; - MakeCurrent_PrevDrawBuffer = 0; - MakeCurrent_PrevReadBuffer = 0; - XMesaDestroyContext( glxCtx->xmesaContext ); - XMesaGarbageCollect(); - free(glxCtx); + if (ctx) { + GLXContext glxCtx = ctx; + (void) dpy; + MakeCurrent_PrevContext = 0; + MakeCurrent_PrevDrawable = 0; + MakeCurrent_PrevReadable = 0; + MakeCurrent_PrevDrawBuffer = 0; + MakeCurrent_PrevReadBuffer = 0; + XMesaDestroyContext( glxCtx->xmesaContext ); + XMesaGarbageCollect(); + free(glxCtx); + } } |