Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.381
diff -u -2 -0 -r1.381 ChangeLog
--- xc/ChangeLog	18 Sep 2004 15:04:28 -0000	1.381
+++ xc/ChangeLog	18 Sep 2004 23:13:43 -0000
@@ -1,20 +1,26 @@
+2004-09-18 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/dix/main.c
+        Bugzilla #1404: Fixing random crashes (like in DAMAGE code etc.)
+        in Xnest due uninitalised GetWindowPixmap.
+        Original patch by Alexander Gottwald <ago@freedesktop.org>
+
 2004-09-18  Matthieu Herrb  <matthieu.herrb@laas.fr>
 
 	reviewed by: <delete if not using a buddy>
 
 	* config/cf/bsdLib.tmpl:
 	define dependencies for libXevie for *BSD systems.
 	* programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml:
 	fix spelling of my first name and remove duplicate.
 	* programs/xrx/xnest-plugin/XnestDis.c:
 	build fix.
 
 2004-09-17  Torrey Lyons  <torrey@freedesktop.org>
 
 	* xc/programs/Xserver/dix/Imakefile:
 	Fix bug that caused restacks to be optimized away in rootless mode.
 
 2004-09-17  Torrey Lyons  <torrey@freedesktop.org>
 	* xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c:
 	* xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c:
 	* xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h:
Index: xc/programs/Xserver/dix/main.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dix/main.c,v
retrieving revision 1.3
diff -u -2 -0 -r1.3 main.c
--- xc/programs/Xserver/dix/main.c	30 Jun 2004 20:06:53 -0000	1.3
+++ xc/programs/Xserver/dix/main.c	18 Sep 2004 23:13:52 -0000
@@ -672,41 +672,41 @@
 	int /*index*/,
 	ScreenPtr /*pScreen*/,
 	int /*argc*/,
 	char ** /*argv*/
 		),
     int argc,
     char **argv)
 {
 
     int i;
     int scanlinepad, format, depth, bitsPerPixel, j, k;
     ScreenPtr pScreen;
 #ifdef DEBUG
     void	(**jNI) ();
 #endif /* DEBUG */
 
     i = screenInfo.numScreens;
     if (i == MAXSCREENS)
 	return -1;
 
-    pScreen = (ScreenPtr) xalloc(sizeof(ScreenRec));
+    pScreen = (ScreenPtr) xcalloc(1, sizeof(ScreenRec));
     if (!pScreen)
 	return -1;
 
     pScreen->devPrivates = (DevUnion *)xcalloc(sizeof(DevUnion),
 						screenPrivateCount);
     if (!pScreen->devPrivates && screenPrivateCount)
     {
 	xfree(pScreen);
 	return -1;
     }
     pScreen->myNum = i;
     pScreen->WindowPrivateLen = 0;
     pScreen->WindowPrivateSizes = (unsigned *)NULL;
     pScreen->totalWindowSize =
         ((sizeof(WindowRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
     pScreen->GCPrivateLen = 0;
     pScreen->GCPrivateSizes = (unsigned *)NULL;
     pScreen->totalGCSize =
         ((sizeof(GC) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
 #ifdef PIXPRIV