From 3a20d23b48c1051e1f22295fd886cc7f643417f6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 10 Dec 2010 19:06:59 +0000
Subject: xserver git update 10/12/2010

---
 xorg-server/dix/dixfonts.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'xorg-server/dix/dixfonts.c')

diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index bd62cc890..e249e6f55 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1817,7 +1817,9 @@ SetDefaultFontPath(char *path)
 	start = end;
     }
     if (!start) {
-	temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
+	if (asprintf(&temp_path, "%s%sbuilt-ins", path, *path ? "," : "")
+	    == -1)
+	    temp_path = NULL;
     } else {
 	temp_path = strdup(path);
     }
-- 
cgit v1.2.3