From ddb8d8945d1f44d16adc366b6612eef20ae813f7 Mon Sep 17 00:00:00 2001
From: Peter Åstrand <astrand@cendio.se>
Date: Fri, 13 Feb 2009 10:23:28 +0100
Subject: xserver: Avoid sending uninitialized padding data over the network

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 dix/main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'dix/main.c')

diff --git a/dix/main.c b/dix/main.c
index 1c66c8622..6a45332c3 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -489,8 +489,9 @@ CreateConnectionBlock(void)
         sizesofar = 0;
     char *pBuf;
 
-    
-    /* Leave off the ridBase and ridMask, these must be sent with 
+
+    memset(&setup, 0, sizeof(xConnSetup));
+    /* Leave off the ridBase and ridMask, these must be sent with
        connection */
 
     setup.release = VendorRelease;
@@ -529,7 +530,8 @@ CreateConnectionBlock(void)
     sizesofar += i;
     while (--i >= 0)
 	*pBuf++ = 0;
-    
+
+    memset(&format, 0, sizeof(xPixmapFormat));
     for (i=0; i<screenInfo.numPixmapFormats; i++)
     {
 	format.depth = screenInfo.formats[i].depth;
@@ -541,7 +543,9 @@ CreateConnectionBlock(void)
     }
 
     connBlockScreenStart = sizesofar;
-    for (i=0; i<screenInfo.numScreens; i++) 
+    memset(&depth, 0, sizeof(xDepth));
+    memset(&visual, 0, sizeof(xVisualType));
+    for (i=0; i<screenInfo.numScreens; i++)
     {
 	ScreenPtr	pScreen;
 	DepthPtr	pDepth;
-- 
cgit v1.2.3