Backport: RRModeCreate: plug memory leak of newModes if AddResource fails

Reported by parfait 1.0: Error: Memory leak (CWE 401) Memory leak of pointer 'newModes' allocated with realloc(((char*)modes), ((num_modes + 1) * 8)) at line 93 of randr/rrmode.c in function 'RRModeCreate'. pointer allocated at line 82 with realloc(((char*)modes), ((num_modes + 1) * 8)). Error: Memory leak (CWE 401) Memory leak of pointer 'newModes' allocated with malloc(8) at line 93 of randr/rrmode.c in function 'RRModeCreate'. pointer allocated at line 84 with malloc(8). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com>

Backport: RRModeCreate: plug memory leak of newModes if AddResource fails
0fc41931 · Alan Coopersmith · Ulrich Sibiller · faddfbec · 0fc41931
Commit 0fc41931 authored Jul 14, 2012 by Alan Coopersmith Committed by Ulrich Sibiller Jun 07, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

rrmode.c nx-X11/programs/Xserver/randr/rrmode.c +4 -2

No files found.
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -98,8 +98,10 @@ RRModeCreate (xRRModeInfo   *modeInfo,
    }

    mode->mode.id = FakeClientID(0);
-    if (!AddResource (mode->mode.id, RRModeType, (pointer) mode))
-	return NULL;
+    if (!AddResource(mode->mode.id, RRModeType, (pointer) mode)) {
+        free(newModes);
+        return NULL;
+    }
    modes = newModes;
    modes[num_modes++] = mode;