Mesa (master): glx: Add missing null check in __glXCloseDisplay

Brian Paul brianp at kemper.freedesktop.org
Fri Feb 7 15:26:49 UTC 2014


Module: Mesa
Branch: master
Commit: 2ae1437a8ecf81676012c7a3507a6ed58e7338b2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ae1437a8ecf81676012c7a3507a6ed58e7338b2

Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date:   Fri Feb  7 14:43:58 2014 +0200

glx: Add missing null check in __glXCloseDisplay

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/glx/glxext.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 2711e57..4a195bd 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -269,7 +269,8 @@ __glXCloseDisplay(Display * dpy, XExtCodes * codes)
    }
    _XUnlockMutex(_Xglobal_lock);
 
-   glx_display_free(priv);
+   if (priv != NULL)
+      glx_display_free(priv);
 
    return 1;
 }




More information about the mesa-commit mailing list