rpms/xorg-x11-server/OLPC-3 dix-destroy-pixmap.patch, NONE, 1.1 xorg-x11-server.spec, 1.341, 1.342

[Daniel Drake]

Author: dsd

Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2392

Modified Files:
	xorg-x11-server.spec 
Added Files:
	dix-destroy-pixmap.patch 
Log Message:
fix DIX crash when Pixmap can't be allocated

dix-destroy-pixmap.patch:

--- NEW FILE dix-destroy-pixmap.patch ---
From: Daniel Drake <dsd at laptop.org>
Subject: fix destroy of NULL pixmap

Index: xorg-server-1.4.99.906/dix/dispatch.c
===================================================================
--- xorg-server-1.4.99.906.orig/dix/dispatch.c
+++ xorg-server-1.4.99.906/dix/dispatch.c
@@ -1338,8 +1338,8 @@ CreatePmap:
 	}
 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
 	    return(client->noClientException);
+	(*pDraw->pScreen->DestroyPixmap)(pMap);
     }
-    (*pDraw->pScreen->DestroyPixmap)(pMap);
     return (BadAlloc);
 }
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- xorg-x11-server.spec	29 Aug 2008 14:51:20 -0000	1.341
+++ xorg-x11-server.spec	2 Sep 2008 21:25:58 -0000	1.342
@@ -59,6 +59,7 @@
 
 Patch6000: exa-copyarea.patch
 Patch6001: xserver-1.5.0-hide-cursor.patch
+Patch6001: dix-destroy-pixmap.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -465,6 +466,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2.3
+- fix DIX crash when Pixmap can't be allocated
+
 * Fri Aug 29 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-2.1
 - add EXA CopyArea patch to solve rendering bugs (dlo#7612)
 - Suppress displaying the cursor until an app calls XDefineCursor().