ximcp/imRmAttr: Handle leaking colormap_ret

XFree colormap_ret and initialize it when appropriate. Variable "colormap_ret" goes out of scope Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-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>

ximcp/imRmAttr: Handle leaking colormap_ret
78b0ca2f · Erkki Seppälä · Ulrich Sibiller · b00312f5 · 78b0ca2f
Commit 78b0ca2f authored Jan 31, 2011 by Erkki Seppälä Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

imRmAttr.c nx-X11/lib/X11/imRmAttr.c +3 -1

No files found.
--- a/nx-X11/lib/X11/imRmAttr.c
+++ b/nx-X11/lib/X11/imRmAttr.c
@@ -960,6 +960,7 @@ _XimEncodePreeditValue(
 				&count, (Atom)p->value)))
 	    return False;

+	XFree(colormap_ret);
    } else if (res->xrm_name == XrmStringToQuark(XNFontSet)) {
 	int		  list_ret;
 	XFontStruct	**struct_list;
@@ -1003,7 +1004,7 @@ _XimEncodeStatusValue(
    XIMArg		*p)
 {
    if (res->xrm_name == XrmStringToQuark(XNStdColormap)) {
-	XStandardColormap	*colormap_ret;
+	XStandardColormap	*colormap_ret = NULL;
 	int			 count;

 	if (!(XGetRGBColormaps(ic->core.im->core.display,
@@ -1011,6 +1012,7 @@ _XimEncodeStatusValue(
 				&count, (Atom)p->value)))
 	    return False;

+	XFree(colormap_ret);
    } else if (res->xrm_name == XrmStringToQuark(XNFontSet)) {
 	int		  list_ret;
 	XFontStruct	**struct_list;