Xrm: NEWTABLE had a memory leak after a memory allocation error

The NEWTABLE macro missed freeing its allocated memory on subsequent memory allocation errors. Added call to Xfree. Variable "table" goes out of scope Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.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>

Xrm: NEWTABLE had a memory leak after a memory allocation error
afd1d4eb · Erkki Seppälä · Ulrich Sibiller · 1ac1b691 · afd1d4eb
Commit afd1d4eb authored Jan 31, 2011 by Erkki Seppälä Committed by Ulrich Sibiller Oct 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/nx-X11/lib/X11/Xrm.c
+++ b/nx-X11/lib/X11/Xrm.c
@@ -842,8 +842,10 @@ static void PutEntry(
 	nprev = NodeBuckets(table); \
    } else { \
 	table->leaf = 1; \
-	if (!(nprev = (NTable *)Xmalloc(sizeof(VEntry *)))) \
+	if (!(nprev = (NTable *)Xmalloc(sizeof(VEntry *)))) {\
+	    Xfree(table); \
 	    return; \
+        } \
 	((LTable)table)->buckets = (VEntry *)nprev; \
    } \
    *nprev = (NTable)NULL; \