xserver: Branch 'master'

[Adam Jackson]

 dix/pixmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a44fe7c8678360d0549cf0e0d63870f3623b1db
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Feb 29 16:43:14 2008 -0500

    Bug #10465: Use calloc() for allocating PixmapRec's.

diff --git a/dix/pixmap.c b/dix/pixmap.c
index 82e388c..d4b4195 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -113,7 +113,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
     if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
 	return NullPixmap;
     
-    pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
+    pPixmap = (PixmapPtr)xcalloc(1, pScreen->totalPixmapSize + pixDataSize);
     if (!pPixmap)
 	return NullPixmap;