Fix wrong Xfree in XListFonts failure path

'ch' gets moved inside the allocated buffer as we're looping through fonts, so keep a reference to the start of the buffer so we can pass that to Xfree in the failure case. Fixes: commit 20a3f99eba5001925b8b313da3accb7900eb1927 "Plug a memory leak" Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Fix wrong Xfree in XListFonts failure path
8ad49a03 · Julien Cristau · Ulrich Sibiller · ac03b517 · 8ad49a03
Commit 8ad49a03 authored Jan 07, 2017 by Julien Cristau Committed by Ulrich Sibiller Mar 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

FontNames.c nx-X11/lib/X11/FontNames.c +4 -2

No files found.
--- a/nx-X11/lib/X11/FontNames.c
+++ b/nx-X11/lib/X11/FontNames.c
@@ -43,6 +43,7 @@ int *actualCount)	/* RETURN */
    register int length;
    char **flist = NULL;
    char *ch = NULL;
+    char *chstart;
    char *chend;
    int count = 0;
    xListFontsReply rep;
@@ -86,6 +87,7 @@ int *actualCount)	/* RETURN */
 	/*
 	 * unpack into null terminated strings.
 	 */
+	chstart = ch;
 	chend = ch + (rlen + 1);
 	length = *(unsigned char *)ch;
 	*ch = 1; /* make sure it is non-zero for XFreeFontNames */
@@ -98,14 +100,14 @@ int *actualCount)	/* RETURN */
 		    *ch = '\0';  /* and replace with null-termination */
 		    count++;
 		} else {
-                    Xfree(ch);
+                    Xfree(chstart);
                    Xfree(flist);
                    flist = NULL;
                    count = 0;
                    break;
 		}
 	    } else {
-                Xfree(ch);
+                Xfree(chstart);
                Xfree(flist);
                flist = NULL;
                count = 0;