From feb71117aebc0932a96b548b4c402b010a008b2d Mon Sep 17 00:00:00 2001 From: George Kyriazis Date: Fri, 4 Mar 2016 12:26:00 -0700 Subject: [PATCH] st/xlib: Don't destroy screen on XCloseDisplay() screen may still be used by other resources that are not yet freed. To correctly fix this there will be a need to account for resources differently, but this quick fix is not any worse than the original code that leaked screens anyway. Reviewed-by: Brian Paul --- src/gallium/state_trackers/glx/xlib/xm_api.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index cee4f18295e..5799cce033c 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -174,9 +174,13 @@ xmesa_close_display(Display *display) /* don't forget to clean up mesaDisplay */ XMesaDisplay xmdpy = &info->mesaDisplay; - if (xmdpy->screen) { - xmdpy->screen->destroy(xmdpy->screen); - } + /** + * XXX: Don't destroy the screens here, since there may still + * be some dangling screen pointers that are used after this point + * if (xmdpy->screen) { + * xmdpy->screen->destroy(xmdpy->screen); + * } + */ free(xmdpy->smapi); XFree((char *) info); -- 2.30.2