From 9deb579dc9366590203afe0576bf88643ab36c89 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:25:17 -0400
Subject: [PATCH] Zero out newly created ExtensionEntry structures, but only
 after the devPrivates have been initialized.

---
 dix/extension.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/extension.c b/dix/extension.c
index ee00ab9dc..f58c73138 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -80,7 +80,7 @@ extern int extensionPrivateLen;
 extern unsigned *extensionPrivateSizes;
 extern unsigned totalExtensionSize;
 
-static int
+static void
 InitExtensionPrivates(ExtensionEntry *ext)
 {
     register char *ptr;
@@ -107,7 +107,6 @@ InitExtensionPrivates(ExtensionEntry *ext)
 	else
 	    ppriv->ptr = (pointer)NULL;
     }
-    return 1;
 }
 
 _X_EXPORT ExtensionEntry *
@@ -127,9 +126,10 @@ AddExtension(char *name, int NumEvents, int NumErrors,
         return((ExtensionEntry *) NULL);
 
     ext = (ExtensionEntry *) xalloc(totalExtensionSize);
-    if (!ext || !InitExtensionPrivates(ext))
+    if (!ext)
 	return((ExtensionEntry *) NULL);
     bzero(ext, totalExtensionSize);
+    InitExtensionPrivates(ext);
     ext->name = (char *)xalloc(strlen(name) + 1);
     ext->num_aliases = 0;
     ext->aliases = (char **)NULL;