Initialise private arrays with calloc, rather than standard malloc.

    (Benjamin Herrenschmidt)

1 files changed, 6 insertions, 3 deletions

diff --git a/dix/privates.c b/dix/privates.c
index 933810517..1e04a7b22 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -347,10 +347,13 @@ AllocateColormapPrivateIndex (InitCmapPrivFunc initPrivFunc)
 	{
 	    privs = (DevUnion *) xrealloc (pColormap->devPrivates,
 		colormapPrivateCount * sizeof(DevUnion));
-    
+	    if (!privs) {
+		colormapPrivateCount--;
+		return -1;
+	    }
+	    bzero(&privs[index], sizeof(DevUnion));
 	    pColormap->devPrivates = privs;
-    
-	    if (!privs || !(*initPrivFunc)(pColormap,index))
+	    if (!(*initPrivFunc)(pColormap,index))
 	    {
 		colormapPrivateCount--;
 		return -1;