[xserver-commit] xserver/composite compinit.c,1.8,1.9

Keith Packard xserver-commit@pdx.freedesktop.org
Fri, 21 Nov 2003 18:19:46 -0800


Committed by: keithp

Update of /cvs/xserver/xserver/composite
In directory pdx:/tmp/cvs-serv31146/composite

Modified Files:
	compinit.c 
Log Message:
	From: fredrikh@gmx.net

	* composite/compinit.c: (compAddArgbVisual):
	Clean up memory leak (installedCmaps)
	
	* configure.ac:
	Fix SCREENSAVER extension selection code


Index: compinit.c
===================================================================
RCS file: /cvs/xserver/xserver/composite/compinit.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- compinit.c	20 Nov 2003 03:31:29 -0000	1.8
+++ compinit.c	22 Nov 2003 02:19:44 -0000	1.9
@@ -164,6 +164,7 @@
     if (!visuals)
     {
 	xfree (vids);
+	xfree (installedCmaps);
 	return FALSE;
     }
     
@@ -184,6 +185,8 @@
 	installedCmap->pVisual = &visuals[j];
     }
 
+    xfree (installedCmaps);
+
     pScreen->visuals = visuals;
     pScreen->numVisuals = numVisuals;