On realloc failure, free font_path_string instead of leaking it

Flagged by cppcheck 1.62: [dix/dixfonts.c:1792]: (error) Common realloc mistake: 'font_path_string' nulled but not freed upon failure Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

On realloc failure, free font_path_string instead of leaking it
aea71067 · Mike Gabriel · edce2521 · aea71067
Commit aea71067 authored Jun 23, 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];