Display.c: fix common realloc mistake

As reported by static analyzer: (error) Common realloc mistake: 'nxagentVisuals' nulled but not freed upon failure

Display.c: fix common realloc mistake
891f24c6 · Ulrich Sibiller · Mike Gabriel · 9b56675d · 891f24c6
Commit 891f24c6 authored Jan 25, 2020 by Ulrich Sibiller Committed by Mike Gabriel May 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Display.c nx-X11/programs/Xserver/hw/nxagent/Display.c +7 -2

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1494,8 +1494,13 @@ void nxagentInitVisuals(void)

  if (nxagentVisuals != NULL)
  {
-    nxagentVisuals = (XVisualInfo *) realloc(nxagentVisuals,
-                                                 nxagentNumVisuals * sizeof(XVisualInfo));
+    XVisualInfo *new = (XVisualInfo *) realloc(nxagentVisuals,
+                                                   nxagentNumVisuals * sizeof(XVisualInfo));
+    /* nxagentVisuals being NULL is covered below */
+    if (new)
+      nxagentVisuals = new;
+    else
+      SAFE_free(nxagentVisuals);
  }

  SAFE_XFree(viList);