mesa: Branch 'master'

[Brian Paul]

 src/glx/x11/dri_glx.c |    1 +
 src/glx/x11/glxext.c  |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
diff-tree eab92fcdc23a8a9d333227e4c98e6a33a9cc1183 (from 47bd759fc9a8f886b90af9a5d53cbb896f37358e)
Author: Panagiotis Papadakos <papadako at csd.uoc.gr>
Date:   Mon Feb 5 08:17:50 2007 -0700

    fix mem leaks

diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 0649358..d88ce91 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -398,6 +398,7 @@ static void driDestroyDisplay(Display *d
 		    else
 		       Drivers = driver->next;
 
+		    Xfree(driver->name);
 		    Xfree(driver);
 		    break;
 		 }
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index d24f853..a039bca 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -396,6 +396,10 @@ static int __glXFreeDisplayPrivate(XExtD
 	(*priv->driDisplay.destroyDisplay)(priv->dpy,
 					   priv->driDisplay.private);
     priv->driDisplay.private = NULL;
+    if (priv->driDisplay.createNewScreen) {
+        Xfree(priv->driDisplay.createNewScreen); /* free array of ptrs */
+        priv->driDisplay.createNewScreen = NULL;
+    }
 #endif
 
     Xfree((char*) priv);