xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011

4 files changed, 417 insertions, 400 deletions

diff --git a/xorg-server/xkb/XKBGAlloc.c b/xorg-server/xkb/XKBGAlloc.c
index 65f92fdba..dd2b04696 100644
--- a/xorg-server/xkb/XKBGAlloc.c
+++ b/xorg-server/xkb/XKBGAlloc.c
@@ -435,6 +435,57 @@ XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap)
 
 /***====================================================================***/
 
+/**
+ * Resize and clear an XKB geometry item array. The array size may
+ * grow or shrink unlike in _XkbGeomAlloc.
+ *
+ * @param buffer[in,out]  buffer to reallocate and clear
+ * @param szItems[in]     currently allocated item count for "buffer"
+ * @param nrItems[in]     required item count for "buffer"
+ * @param itemSize[in]    size of a single item in "buffer"
+ * @param clearance[in]   items to clear after reallocation
+ *
+ * @see _XkbGeomAlloc
+ *
+ * @return TRUE if reallocation succeeded. Otherwise FALSE is returned
+ *         and contents of "buffer" aren't touched.
+ */
+Bool
+XkbGeomRealloc(void **buffer, int szItems, int nrItems,
+               int itemSize, XkbGeomClearance clearance)
+{
+    void *items;
+    int clearBegin;
+    /* Check validity of arguments. */
+    if (!buffer)
+        return FALSE;
+    items = *buffer;
+    if (!((items && (szItems > 0)) || (!items && !szItems)))
+        return FALSE;
+    /* Check if there is need to resize. */
+    if (nrItems != szItems)
+        if (!(items = realloc(items, nrItems * itemSize)))
+            return FALSE;
+    /* Clear specified items to zero. */
+    switch (clearance)
+    {
+    case XKB_GEOM_CLEAR_EXCESS:
+        clearBegin = szItems;
+        break;
+    case XKB_GEOM_CLEAR_ALL:
+        clearBegin = 0;
+        break;
+    case XKB_GEOM_CLEAR_NONE:
+    default:
+        clearBegin = nrItems;
+        break;
+    }
+    if (items && (clearBegin < nrItems))
+        memset((char *)items + (clearBegin * itemSize), 0, (nrItems - clearBegin) * itemSize);
+    *buffer = items;
+    return TRUE;
+}
+
 static Status
 _XkbGeomAlloc(	void **		old,
 		unsigned short *	num,
@@ -451,18 +502,15 @@ _XkbGeomAlloc(	void **		old,
 	return Success;
 
     *total= (*num)+num_new;
-    if ((*old)!=NULL)
-	 (*old)= realloc((*old),(*total)*sz_elem);
-    else (*old)= calloc((*total),sz_elem);
-    if ((*old)==NULL) {
+
+    if (!XkbGeomRealloc(old, *num, *total, sz_elem, XKB_GEOM_CLEAR_EXCESS))
+    {
+	free(*old);
+	(*old)= NULL;
 	*total= *num= 0;
 	return BadAlloc;
     }
 
-    if (*num>0) {
-	char *tmp= (char *)(*old);
-	memset(&tmp[sz_elem*(*num)], 0, (num_new*sz_elem));
-    }
     return Success;
 }
 
diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c
index e62078de8..3d301d88e 100644
--- a/xorg-server/xkb/ddxList.c
+++ b/xorg-server/xkb/ddxList.c
@@ -1,301 +1,303 @@
-/************************************************************

-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.

-

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Silicon Graphics not be 

-used in advertising or publicity pertaining to distribution 

-of the software without specific prior written permission.

-Silicon Graphics makes no representation about the suitability 

-of this software for any purpose. It is provided "as is"

-without any express or implied warranty.

-

-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 

-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 

-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 

-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

-THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

-********************************************************/

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdio.h>

-#include <ctype.h>

-#include <X11/X.h>

-#include <X11/Xos.h>

-#include <X11/Xproto.h>

-#include <X11/keysym.h>

-#include <X11/extensions/XKM.h>

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#define	XKBSRV_NEED_FILE_FUNCS

-#include <xkbsrv.h>

-#include <X11/extensions/XI.h>

-

-#ifdef WIN32

-/* from ddxLoad.c */

-extern const char* Win32TempDir();

-extern int Win32System(const char *cmdline);

-#undef System

-#define System Win32System

-

-#define W32_tmparg " '%s'"

-#define W32_tmpfile ,tmpname

-#define W32_tmplen strlen(tmpname)+3

-#else

-#define W32_tmparg

-#define W32_tmpfile 

-#define W32_tmplen 0

-#endif 

-

-/***====================================================================***/

-

-static char *componentDirs[_XkbListNumComponents] = {

-	"keycodes", "types", "compat", "symbols", "geometry"

-};

-

-/***====================================================================***/

-

-static Status

-_AddListComponent(	XkbSrvListInfoPtr	list,

-			int			what,

-			unsigned		flags,

-			char *			str,

-			ClientPtr		client)

-{

-int		slen,wlen;

-unsigned char *	wire8;

-unsigned short *wire16;

-char *		tmp;

-

-    if (list->nTotal>=list->maxRtrn) {

-	list->nTotal++;

-	return Success;

-    }

-    tmp= strchr(str,')');

-    if ((tmp==NULL)&&((tmp=strchr(str,'('))==NULL)) {

-	slen= strlen(str);

-	while ((slen>0) && isspace(str[slen-1])) {

-	    slen--;

-	}

-    }

-    else {

-	slen= (tmp-str+1);

-    }

-    wlen= (((slen+1)/2)*2)+4;	/* four bytes for flags and length, pad to */

-				/* 2-byte boundary */

-    if ((list->szPool-list->nPool)<wlen) {

-	if (wlen>1024)	list->szPool+= XkbPaddedSize(wlen*2);

-	else		list->szPool+= 1024;

-	list->pool= realloc(list->pool, list->szPool * sizeof(char));

-	if (!list->pool)

-	    return BadAlloc;

-    }

-    wire16= (unsigned short *)&list->pool[list->nPool];

-    wire8= (unsigned char *)&wire16[2];

-    wire16[0]= flags;

-    wire16[1]= slen;

-    memcpy(wire8,str,slen);

-    if (client->swapped) {

-	register int n;

-	swaps(&wire16[0],n);

-	swaps(&wire16[1],n);

-    }

-    list->nPool+= wlen;

-    list->nFound[what]++;

-    list->nTotal++;

-    return Success;

-}

-

-/***====================================================================***/

-static Status

-XkbDDXListComponent(	DeviceIntPtr 		dev,

-			int			what,

-			XkbSrvListInfoPtr	list,

-			ClientPtr		client)

-{

-char 	*file,*map,*tmp,*buf=NULL;

-FILE 	*in;

-Status	status;

-int	rval;

-Bool	haveDir;

-#ifdef WIN32

-char	tmpname[PATH_MAX];

-#endif

-

-    if ((list->pattern[what]==NULL)||(list->pattern[what][0]=='\0'))

-	return Success;

-    file= list->pattern[what];

-    map= strrchr(file,'(');

-    if (map!=NULL) {

-	char *tmp;

-	map++;

-	tmp= strrchr(map,')');

-	if ((tmp==NULL)||(tmp[1]!='\0')) {

-	    /* illegal pattern.  No error, but no match */

-	    return Success;

-	}

-    }

-

-    in= NULL;

-    haveDir= TRUE;

-#ifdef WIN32

-    strcpy(tmpname, Win32TempDir());

-    strcat(tmpname, "\\xkb_XXXXXX");

-    (void) mktemp(tmpname);

-#endif

-    if (XkbBaseDirectory!=NULL) {

-	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {

-	    if (asprintf(&buf, "%s/%s.dir", XkbBaseDirectory,

-			 componentDirs[what]) == -1)

-		buf = NULL;

-	    else

-		in = fopen(buf,"r");

-	}

-	if (!in) {

-	    haveDir= FALSE;

-	    free(buf);

-	    if (asprintf

-		(&buf,

-		 "'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,

-		 XkbBinDirectory, XkbBaseDirectory, componentDirs[what],

-		 (long) ((xkbDebugFlags < 2) ? 1 :

-			 ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),

-		 file W32_tmpfile

-		    ) == -1)

-		buf = NULL;

-	}

-    }

-    else {

-	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {

-	    if (asprintf(&buf, "%s.dir", componentDirs[what]) == -1)

-		buf = NULL;

-	    else

-		in = fopen(buf,"r");

-	}

-	if (!in) {

-	    haveDir= FALSE;

-	    free(buf);

-	    if (asprintf

-		(&buf,

-		 "xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,

-		 componentDirs[what],

-		 (long)	((xkbDebugFlags < 2) ? 1 :

-			 ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),

-		 file W32_tmpfile

-		    ) == -1)

-		buf = NULL;

-	}

-    }

-    status= Success;

-    if (!haveDir)

-    {  

-#ifndef WIN32

-	in= Popen(buf,"r");

-#else

-        if (xkbDebugFlags)

-            DebugF("[xkb] xkbList executes: %s\n",buf);

-	if (System(buf) < 0)

-	    ErrorF("[xkb] Could not invoke keymap compiler\n");

-	else

-	    in= fopen(tmpname, "r");

-#endif

-    }

-    if (!in)

-    {

-	free(buf);

-#ifdef WIN32

-	unlink(tmpname);

-#endif

-	return BadImplementation;

-    }

-    list->nFound[what]= 0;

-    free(buf);

-    buf = malloc(PATH_MAX * sizeof(char));

-    if (!buf)

-        return BadAlloc;

-    while ((status==Success)&&((tmp=fgets(buf,PATH_MAX,in))!=NULL)) {

-	unsigned flags;

-	register unsigned int i;

-	if (*tmp=='#') /* comment, skip it */

-	    continue;

-	if (!strncmp(tmp, "Warning:", 8) || !strncmp(tmp, "        ", 8))

-	    /* skip warnings too */

-	    continue;

-	flags= 0;

-	/* each line in the listing is supposed to start with two */

-	/* groups of eight characters, which specify the general  */

-	/* flags and the flags that are specific to the component */

-	/* if they're missing, fail with BadImplementation	  */

-	for (i=0;(i<8)&&(status==Success);i++) { /* read the general flags */

-	   if (isalpha(*tmp))	flags|= (1L<<i);

-	   else if (*tmp!='-')	status= BadImplementation;

-	   tmp++;

-	}

-	if (status != Success)  break;

-	if (!isspace(*tmp)) {

-	     status= BadImplementation;

-	     break;

-	}

-	else tmp++;

-	for (i=0;(i<8)&&(status==Success);i++) { /* read the component flags */

-	   if (isalpha(*tmp))	flags|= (1L<<(i+8));

-	   else if (*tmp!='-')	status= BadImplementation;

-	   tmp++;

-	}

-	if (status != Success)  break;

-	if (isspace(*tmp)) {

-	    while (isspace(*tmp)) {

-		tmp++;

-	    }

-	}

-	else {

-	    status= BadImplementation;

-	    break;

-	}

-	status= _AddListComponent(list,what,flags,tmp,client);

-    }

-#ifndef WIN32

-    if (haveDir)

-	fclose(in);

-    else if ((rval=Pclose(in))!=0) {

-	if (xkbDebugFlags)

-	    ErrorF("[xkb] xkbcomp returned exit code %d\n",rval);

-    }

-#else

-    fclose(in);

-    unlink(tmpname);

-#endif

-    free(buf);

-    return status;

-}

-

-/***====================================================================***/

-

-/* ARGSUSED */

-Status

-XkbDDXList(DeviceIntPtr	dev,XkbSrvListInfoPtr list,ClientPtr client)

-{

-Status	status;

-

-    status= XkbDDXListComponent(dev,_XkbListKeycodes,list,client);

-    if (status==Success)

-	status= XkbDDXListComponent(dev,_XkbListTypes,list,client);

-    if (status==Success)

-	status= XkbDDXListComponent(dev,_XkbListCompat,list,client);

-    if (status==Success)

-	status= XkbDDXListComponent(dev,_XkbListSymbols,list,client);

-    if (status==Success)

-	status= XkbDDXListComponent(dev,_XkbListGeometry,list,client);

-    return status;

-}

+/************************************************************
+Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be 
+used in advertising or publicity pertaining to distribution 
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability 
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+#include <X11/X.h>
+#include <X11/Xos.h>
+#include <X11/Xproto.h>
+#include <X11/keysym.h>
+#include <X11/extensions/XKM.h>
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#define	XKBSRV_NEED_FILE_FUNCS
+#include <xkbsrv.h>
+#include <X11/extensions/XI.h>
+
+#ifdef WIN32
+/* from ddxLoad.c */
+extern const char* Win32TempDir();
+extern int Win32System(const char *cmdline);
+#undef System
+#define System Win32System
+
+#define W32_tmparg " '%s'"
+#define W32_tmpfile ,tmpname
+#define W32_tmplen strlen(tmpname)+3
+#else
+#define W32_tmparg
+#define W32_tmpfile 
+#define W32_tmplen 0
+#endif 
+
+/***====================================================================***/
+
+static char *componentDirs[_XkbListNumComponents] = {
+	"keycodes", "types", "compat", "symbols", "geometry"
+};
+
+/***====================================================================***/
+
+static Status
+_AddListComponent(	XkbSrvListInfoPtr	list,
+			int			what,
+			unsigned		flags,
+			char *			str,
+			ClientPtr		client)
+{
+int		slen,wlen;
+unsigned char *	wire8;
+unsigned short *wire16;
+char *		tmp;
+
+    if (list->nTotal>=list->maxRtrn) {
+	list->nTotal++;
+	return Success;
+    }
+    tmp= strchr(str,')');
+    if ((tmp==NULL)&&((tmp=strchr(str,'('))==NULL)) {
+	slen= strlen(str);
+	while ((slen>0) && isspace(str[slen-1])) {
+	    slen--;
+	}
+    }
+    else {
+	slen= (tmp-str+1);
+    }
+    wlen= (((slen+1)/2)*2)+4;	/* four bytes for flags and length, pad to */
+				/* 2-byte boundary */
+    if ((list->szPool-list->nPool)<wlen) {
+	if (wlen>1024)	list->szPool+= XkbPaddedSize(wlen*2);
+	else		list->szPool+= 1024;
+	list->pool= realloc(list->pool, list->szPool * sizeof(char));
+	if (!list->pool)
+	    return BadAlloc;
+    }
+    wire16= (unsigned short *)&list->pool[list->nPool];
+    wire8= (unsigned char *)&wire16[2];
+    wire16[0]= flags;
+    wire16[1]= slen;
+    memcpy(wire8,str,slen);
+    if (client->swapped) {
+	register int n;
+	swaps(&wire16[0],n);
+	swaps(&wire16[1],n);
+    }
+    list->nPool+= wlen;
+    list->nFound[what]++;
+    list->nTotal++;
+    return Success;
+}
+
+/***====================================================================***/
+static Status
+XkbDDXListComponent(	DeviceIntPtr 		dev,
+			int			what,
+			XkbSrvListInfoPtr	list,
+			ClientPtr		client)
+{
+char 	*file,*map,*tmp,*buf=NULL;
+FILE 	*in;
+Status	status;
+int	rval;
+Bool	haveDir;
+#ifdef WIN32
+char	tmpname[PATH_MAX];
+#endif
+
+    if ((list->pattern[what]==NULL)||(list->pattern[what][0]=='\0'))
+	return Success;
+    file= list->pattern[what];
+    map= strrchr(file,'(');
+    if (map!=NULL) {
+	char *tmp;
+	map++;
+	tmp= strrchr(map,')');
+	if ((tmp==NULL)||(tmp[1]!='\0')) {
+	    /* illegal pattern.  No error, but no match */
+	    return Success;
+	}
+    }
+
+    in= NULL;
+    haveDir= TRUE;
+#ifdef WIN32
+    strcpy(tmpname, Win32TempDir());
+    strcat(tmpname, "\\xkb_XXXXXX");
+    (void) mktemp(tmpname);
+#endif
+    if (XkbBaseDirectory!=NULL) {
+	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {
+	    if (asprintf(&buf, "%s/%s.dir", XkbBaseDirectory,
+			 componentDirs[what]) == -1)
+		buf = NULL;
+	    else
+		in = fopen(buf,"r");
+	}
+	if (!in) {
+	    haveDir= FALSE;
+	    free(buf);
+	    if (asprintf
+		(&buf,
+		 "'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,
+		 XkbBinDirectory, XkbBaseDirectory, componentDirs[what],
+		 (long) ((xkbDebugFlags < 2) ? 1 :
+			 ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),
+		 file W32_tmpfile
+		    ) == -1)
+		buf = NULL;
+	}
+    }
+    else {
+	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {
+	    if (asprintf(&buf, "%s.dir", componentDirs[what]) == -1)
+		buf = NULL;
+	    else
+		in = fopen(buf,"r");
+	}
+	if (!in) {
+	    haveDir= FALSE;
+	    free(buf);
+	    if (asprintf
+		(&buf,
+		 "xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,
+		 componentDirs[what],
+		 (long)	((xkbDebugFlags < 2) ? 1 :
+			 ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),
+		 file W32_tmpfile
+		    ) == -1)
+		buf = NULL;
+	}
+    }
+    status= Success;
+    if (!haveDir)
+    {  
+#ifndef WIN32
+	in= Popen(buf,"r");
+#else
+        if (xkbDebugFlags)
+            DebugF("[xkb] xkbList executes: %s\n",buf);
+	if (System(buf) < 0)
+	    ErrorF("[xkb] Could not invoke keymap compiler\n");
+	else
+	    in= fopen(tmpname, "r");
+#endif
+    }
+    if (!in)
+    {
+	free(buf);
+#ifdef WIN32
+	unlink(tmpname);
+#endif
+	return BadImplementation;
+    }
+    list->nFound[what]= 0;
+    free(buf);
+    buf = malloc(PATH_MAX * sizeof(char));
+    if (!buf) {
+        fclose(in);
+        return BadAlloc;
+    }
+    while ((status==Success)&&((tmp=fgets(buf,PATH_MAX,in))!=NULL)) {
+	unsigned flags;
+	register unsigned int i;
+	if (*tmp=='#') /* comment, skip it */
+	    continue;
+	if (!strncmp(tmp, "Warning:", 8) || !strncmp(tmp, "        ", 8))
+	    /* skip warnings too */
+	    continue;
+	flags= 0;
+	/* each line in the listing is supposed to start with two */
+	/* groups of eight characters, which specify the general  */
+	/* flags and the flags that are specific to the component */
+	/* if they're missing, fail with BadImplementation	  */
+	for (i=0;(i<8)&&(status==Success);i++) { /* read the general flags */
+	   if (isalpha(*tmp))	flags|= (1L<<i);
+	   else if (*tmp!='-')	status= BadImplementation;
+	   tmp++;
+	}
+	if (status != Success)  break;
+	if (!isspace(*tmp)) {
+	     status= BadImplementation;
+	     break;
+	}
+	else tmp++;
+	for (i=0;(i<8)&&(status==Success);i++) { /* read the component flags */
+	   if (isalpha(*tmp))	flags|= (1L<<(i+8));
+	   else if (*tmp!='-')	status= BadImplementation;
+	   tmp++;
+	}
+	if (status != Success)  break;
+	if (isspace(*tmp)) {
+	    while (isspace(*tmp)) {
+		tmp++;
+	    }
+	}
+	else {
+	    status= BadImplementation;
+	    break;
+	}
+	status= _AddListComponent(list,what,flags,tmp,client);
+    }
+#ifndef WIN32
+    if (haveDir)
+	fclose(in);
+    else if ((rval=Pclose(in))!=0) {
+	if (xkbDebugFlags)
+	    ErrorF("[xkb] xkbcomp returned exit code %d\n",rval);
+    }
+#else
+    fclose(in);
+    unlink(tmpname);
+#endif
+    free(buf);
+    return status;
+}
+
+/***====================================================================***/
+
+/* ARGSUSED */
+Status
+XkbDDXList(DeviceIntPtr	dev,XkbSrvListInfoPtr list,ClientPtr client)
+{
+Status	status;
+
+    status= XkbDDXListComponent(dev,_XkbListKeycodes,list,client);
+    if (status==Success)
+	status= XkbDDXListComponent(dev,_XkbListTypes,list,client);
+    if (status==Success)
+	status= XkbDDXListComponent(dev,_XkbListCompat,list,client);
+    if (status==Success)
+	status= XkbDDXListComponent(dev,_XkbListSymbols,list,client);
+    if (status==Success)
+	status= XkbDDXListComponent(dev,_XkbListGeometry,list,client);
+    return status;
+}
diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c
index 3a56bea4c..cc9aaa75a 100644
--- a/xorg-server/xkb/xkbUtils.c
+++ b/xorg-server/xkb/xkbUtils.c
@@ -1398,42 +1398,26 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
 
         /* properties */
         if (src->geom->num_properties) {
-            if (src->geom->num_properties != dst->geom->sz_properties) {
-                /* If we've got more properties in the destination than
-                 * the source, run through and free all the excess ones
-                 * first. */
-                if (src->geom->num_properties < dst->geom->sz_properties) {
-                    for (i = src->geom->num_properties,
-                         dprop = dst->geom->properties + i;
-                         i < dst->geom->num_properties;
-                         i++, dprop++) {
-                        free(dprop->name);
-                        free(dprop->value);
-                    }
+            /* If we've got more properties in the destination than
+             * the source, run through and free all the excess ones
+             * first. */
+            if (src->geom->num_properties < dst->geom->sz_properties) {
+                for (i = src->geom->num_properties, dprop = dst->geom->properties + i;
+                     i < dst->geom->num_properties;
+                     i++, dprop++) {
+                    free(dprop->name);
+                    free(dprop->value);
                 }
-
-                if (dst->geom->sz_properties)
-                    tmp = realloc(dst->geom->properties,
-                                   src->geom->num_properties *
-                                    sizeof(XkbPropertyRec));
-                else
-                    tmp = malloc(src->geom->num_properties *
-                                  sizeof(XkbPropertyRec));
-                if (!tmp)
-                    return FALSE;
-                dst->geom->properties = tmp;
             }
 
+            /* Reallocate and clear all new items if the buffer grows. */
+            if (!XkbGeomRealloc((void **)&dst->geom->properties, dst->geom->sz_properties, src->geom->num_properties,
+                                sizeof(XkbPropertyRec), XKB_GEOM_CLEAR_EXCESS))
+                return FALSE;
             /* We don't set num_properties as we need it to try and avoid
              * too much reallocing. */
             dst->geom->sz_properties = src->geom->num_properties;
 
-            if (dst->geom->sz_properties > dst->geom->num_properties) {
-                memset(dst->geom->properties + dst->geom->num_properties, 0,
-                      (dst->geom->sz_properties - dst->geom->num_properties) *
-                      sizeof(XkbPropertyRec));
-            }
-
             for (i = 0,
                   sprop = src->geom->properties,
                   dprop = dst->geom->properties;
@@ -1482,36 +1466,20 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
 
         /* colors */
         if (src->geom->num_colors) {
-            if (src->geom->num_colors != dst->geom->sz_colors) {
-                if (src->geom->num_colors < dst->geom->sz_colors) {
-                    for (i = src->geom->num_colors,
-                         dcolor = dst->geom->colors + i;
-                         i < dst->geom->num_colors;
-                         i++, dcolor++) {
-                        free(dcolor->spec);
-                    }
+            if (src->geom->num_colors < dst->geom->sz_colors) {
+                for (i = src->geom->num_colors, dcolor = dst->geom->colors + i;
+                     i < dst->geom->num_colors;
+                     i++, dcolor++) {
+                    free(dcolor->spec);
                 }
-
-                if (dst->geom->sz_colors)
-                    tmp = realloc(dst->geom->colors,
-                                   src->geom->num_colors *
-                                    sizeof(XkbColorRec));
-                else
-                    tmp = malloc(src->geom->num_colors *
-                                  sizeof(XkbColorRec));
-                if (!tmp)
-                    return FALSE;
-                dst->geom->colors = tmp;
             }
 
+            /* Reallocate and clear all new items if the buffer grows. */
+            if (!XkbGeomRealloc((void **)&dst->geom->colors, dst->geom->sz_colors, src->geom->num_colors,
+                                sizeof(XkbColorRec), XKB_GEOM_CLEAR_EXCESS))
+                return FALSE;
             dst->geom->sz_colors = src->geom->num_colors;
 
-            if (dst->geom->sz_colors > dst->geom->num_colors) {
-                memset(dst->geom->colors + dst->geom->num_colors, 0,
-                      (dst->geom->sz_colors - dst->geom->num_colors) *
-                      sizeof(XkbColorRec));
-            }
-
             for (i = 0,
                   scolor = src->geom->colors,
                   dcolor = dst->geom->colors;
@@ -1573,10 +1541,10 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
         }
 
         if (src->geom->num_shapes) {
-            tmp = calloc(src->geom->num_shapes, sizeof(XkbShapeRec));
-            if (!tmp)
+            /* Reallocate and clear all items. */
+            if (!XkbGeomRealloc((void **)&dst->geom->shapes, dst->geom->sz_shapes, src->geom->num_shapes,
+                                sizeof(XkbShapeRec), XKB_GEOM_CLEAR_ALL))
                 return FALSE;
-            dst->geom->shapes = tmp;
 
             for (i = 0, sshape = src->geom->shapes, dshape = dst->geom->shapes;
                  i < src->geom->num_shapes;
@@ -1693,20 +1661,13 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
             }
 
             dst->geom->num_sections = 0;
-            dst->geom->sections = NULL;
         }
 
         if (src->geom->num_sections) {
-            if (dst->geom->sz_sections)
-                tmp = realloc(dst->geom->sections,
-                               src->geom->num_sections *
-                                sizeof(XkbSectionRec));
-            else
-                tmp = malloc(src->geom->num_sections * sizeof(XkbSectionRec));
-            if (!tmp)
+            /* Reallocate and clear all items. */
+            if (!XkbGeomRealloc((void **)&dst->geom->sections, dst->geom->sz_sections, src->geom->num_sections,
+                                sizeof(XkbSectionRec), XKB_GEOM_CLEAR_ALL))
                 return FALSE;
-            memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec));
-            dst->geom->sections = tmp;
             dst->geom->num_sections = src->geom->num_sections;
             dst->geom->sz_sections = src->geom->num_sections;
 
@@ -1809,21 +1770,13 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
                 }
             }
             dst->geom->num_doodads = 0;
-            dst->geom->doodads = NULL;
         }
 
         if (src->geom->num_doodads) {
-            if (dst->geom->sz_doodads)
-                tmp = realloc(dst->geom->doodads,
-                               src->geom->num_doodads *
-                                sizeof(XkbDoodadRec));
-            else
-                tmp = malloc(src->geom->num_doodads *
-                              sizeof(XkbDoodadRec));
-            if (!tmp)
+            /* Reallocate and clear all items. */
+            if (!XkbGeomRealloc((void **)&dst->geom->doodads, dst->geom->sz_doodads, src->geom->num_doodads,
+                                sizeof(XkbDoodadRec), XKB_GEOM_CLEAR_ALL))
                 return FALSE;
-            memset(tmp, 0, src->geom->num_doodads * sizeof(XkbDoodadRec));
-            dst->geom->doodads = tmp;
 
             dst->geom->sz_doodads = src->geom->num_doodads;
 
@@ -1860,20 +1813,14 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
 
         /* key aliases */
         if (src->geom->num_key_aliases) {
-            if (src->geom->num_key_aliases != dst->geom->sz_key_aliases) {
-                if (dst->geom->sz_key_aliases)
-                    tmp = realloc(dst->geom->key_aliases,
-                                   src->geom->num_key_aliases *
-                                    2 * XkbKeyNameLength);
-                else
-                    tmp = malloc(src->geom->num_key_aliases *
-                                  2 * XkbKeyNameLength);
-                if (!tmp)
-                    return FALSE;
-                dst->geom->key_aliases = tmp;
+            /* Reallocate but don't clear any items. There is no need
+             * to clear anything because data is immediately copied
+             * over the whole memory area with memcpy. */
+            if (!XkbGeomRealloc((void **)&dst->geom->key_aliases, dst->geom->sz_key_aliases, src->geom->num_key_aliases,
+                                2 * XkbKeyNameLength, XKB_GEOM_CLEAR_NONE))
+                return FALSE;
 
-                dst->geom->sz_key_aliases = src->geom->num_key_aliases;
-            }
+            dst->geom->sz_key_aliases = src->geom->num_key_aliases;
 
             memcpy(dst->geom->key_aliases, src->geom->key_aliases,
                    src->geom->num_key_aliases * 2 * XkbKeyNameLength);
diff --git a/xorg-server/xkb/xkbgeom.h b/xorg-server/xkb/xkbgeom.h
index fe4da3806..d10b956a6 100644
--- a/xorg-server/xkb/xkbgeom.h
+++ b/xorg-server/xkb/xkbgeom.h
@@ -311,6 +311,17 @@ typedef struct _XkbGeometrySizes {
 	unsigned short	num_key_aliases;
 } XkbGeometrySizesRec,*XkbGeometrySizesPtr;
 
+/**
+ * Specifies which items should be cleared in an XKB geometry array
+ * when the array is reallocated.
+ */
+typedef enum
+{
+    XKB_GEOM_CLEAR_NONE,   /* Don't clear any items, just reallocate.   */
+    XKB_GEOM_CLEAR_EXCESS, /* Clear new extra items after reallocation. */
+    XKB_GEOM_CLEAR_ALL     /* Clear all items after reallocation.       */
+} XkbGeomClearance;
+
 extern	XkbPropertyPtr
 XkbAddGeomProperty(
     XkbGeometryPtr	/* geom */,
@@ -507,6 +518,15 @@ XkbFreeGeometry(
     Bool		/* freeMap */
 );
 
+extern Bool
+XkbGeomRealloc(
+    void **		/* buffer */,
+    int			/* szItems */,
+    int			/* nrItems */,
+    int			/* itemSize */,
+    XkbGeomClearance	/* clearance */
+);
+
 extern Status
 XkbAllocGeomProps(
     XkbGeometryPtr	/* geom */,