XDefaultOMIF.c: Fix memory leaks in get_font_name

Instead of copying the value returned by get_prop_name and then releasing it, directly use the return value of get_prop_name, which allocates memory for the name. If get_prop_name returns NULL, continue on to XFreeFont to release the font before returning the NULL via the normal function return. Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

XDefaultOMIF.c: Fix memory leaks in get_font_name
54550ebb · Alan Coopersmith · Ulrich Sibiller · b7694b0b · 54550ebb
Commit 54550ebb authored Feb 01, 2011 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

XDefaultOMIF.c nx-X11/lib/X11/XDefaultOMIF.c +2 -8

No files found.
--- a/nx-X11/lib/X11/XDefaultOMIF.c
+++ b/nx-X11/lib/X11/XDefaultOMIF.c
@@ -381,7 +381,7 @@ get_font_name(
    XOC oc,
    char *pattern)
 {
-    char **list, *name, *prop_name;
+    char **list, *name;
    int count;
    XFontStruct *fs;
    Display *dpy = oc->core.om->core.display;
@@ -397,13 +397,7 @@ get_font_name(
 	fs = XLoadQueryFont(dpy, pattern);
 	if (fs == NULL) return NULL;
-	prop_name = get_prop_name(dpy, fs);
+	name = get_prop_name(dpy, fs);
-	if (prop_name == NULL) return NULL;
-	name = (char*) Xmalloc(strlen(prop_name) + 1);
-	if (name)
-	    strcpy(name, prop_name);
 	XFreeFont(dpy, fs);
    }
    return name;