summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-09-18 23:18:35 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-09-18 23:18:35 +0000
commit9297c6149f83de22395503c484a2ca65dbffaf6b (patch)
tree3c34d4e7f58d9b4b848176b6d9f665d7ca381468 /dix
parent6344bb51e2a97d9678cec2ec1dab19abfe9d9e8d (diff)
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1404 - Fixing
random crashes (like in DAMAGE code etc.) in Xnest due uninitalised GetWindowPixmap. Original patch by Alexander Gottwald <ago@freedesktop.org>
Diffstat (limited to 'dix')
-rw-r--r--dix/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c
index 2a930d9dc..d1883c3e4 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.3 2004/06/30 20:06:53 kem Exp $ */
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
/***********************************************************
@@ -689,7 +689,7 @@ AddScreen(
if (i == MAXSCREENS)
return -1;
- pScreen = (ScreenPtr) xalloc(sizeof(ScreenRec));
+ pScreen = (ScreenPtr) xcalloc(1, sizeof(ScreenRec));
if (!pScreen)
return -1;