From a12cf779e828ec70da714832e1eaa730119fe10c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 30 Sep 2013 08:58:27 +0200
Subject: git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013

xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7
libXau           commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
pixman           commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5
fontconfig       commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
mesa             commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
---
 libXau/AuFileName.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libXau')

diff --git a/libXau/AuFileName.c b/libXau/AuFileName.c
index 090427387..7cedfcc5b 100644
--- a/libXau/AuFileName.c
+++ b/libXau/AuFileName.c
@@ -66,12 +66,14 @@ XauFileName (void)
 	return NULL;
     }
     size = strlen (name) + strlen(&slashDotXauthority[1]) + 2;
-    if (size > bsize) {
+    if ((size > bsize) || (buf == NULL)) {
 	if (buf)
 	    free (buf);
 	buf = malloc (size);
-	if (!buf)
+	if (!buf) {
+	    bsize = 0;
 	    return NULL;
+	}
 
         if (!atexit_registered) {
             atexit(free_filename_buffer);
-- 
cgit v1.2.3