From: George Kyriazis <george.kyriazis@intel.com>
Date: Fri, 4 Mar 2016 19:26:00 +0000 (-0700)
Subject: st/xlib: Don't destroy screen on XCloseDisplay()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=feb71117aebc0932a96b548b4c402b010a008b2d;hp=1f862e923cba1d5cd54a707f70f0be113635e855;p=mesa.git

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 <brianp@vmware.com>
---

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);