Display.c: prevent PVS Studio realloc warning

"V701 realloc() possible leak: when realloc() fails in allocating memory, original pointer 'nxagentDefaultColormaps' is lost. Consider assigning realloc() to a temporary pointer."

Display.c: prevent PVS Studio realloc warning
67c7513b · Ulrich Sibiller · db134de3 · 67c7513b
Commit 67c7513b authored Jan 04, 2021 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

Display.c nx-X11/programs/Xserver/hw/nxagent/Display.c +11 -5

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -2577,12 +2577,18 @@ Bool nxagentReconnectDisplay(void *p0)

  nxagentNumDefaultColormaps = nxagentNumVisuals;

-  nxagentDefaultColormaps = (Colormap *) realloc(nxagentDefaultColormaps,
-                                 nxagentNumDefaultColormaps * sizeof(Colormap));
-
-  if (nxagentDefaultColormaps == NULL)
  {
-    FatalError("Can't allocate memory for the default colormaps\n");
+    Colormap * tmp = (Colormap *) realloc(nxagentDefaultColormaps,
+                                              nxagentNumDefaultColormaps * sizeof(Colormap));
+    if (tmp == NULL)
+    {
+      SAFE_free(nxagentDefaultColormaps);
+      FatalError("Can't allocate memory for the default colormaps\n");
+    }
+    else
+    {
+      nxagentDefaultColormaps = tmp;
+    }
  }

  reconnectDisplayState = ALLOC_DEF_COLORMAP;