Merge branch 'sunweaver-pr/dixfont-fix' into 3.6.x

Attributes GH PR #58: https://github.com/ArcticaProject/nx-libs/pull/58

Merge branch 'sunweaver-pr/dixfont-fix' into 3.6.x
f58006d9 · Mike Gabriel · edce2521 · aea71067 · f58006d9
Unverified Commit f58006d9 authored Dec 28, 2015 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

dixfonts.c nx-X11/programs/Xserver/dix/dixfonts.c +7 -4

No files found.
--- a/nx-X11/programs/Xserver/dix/dixfonts.c
+++ b/nx-X11/programs/Xserver/dix/dixfonts.c
@@ -1929,11 +1929,14 @@ GetFontPath(int *count, int *length)
 	fpe = font_path_elements[i];
 	len += fpe->name_length + 1;
    }
-    font_path_string = (unsigned char *) xrealloc(font_path_string, len);
-    if (!font_path_string)
-	return NULL;
+    c = realloc(font_path_string, len);
+    if (c == NULL) {
+	free(font_path_string);
+	font_path_string = NULL;
+	return BadAlloc;
+    }

-    c = font_path_string;
+    font_path_string = c;
    *length = 0;
    for (i = 0; i < num_fpes; i++) {
 	fpe = font_path_elements[i];