Avoid memory leak/corruption if realloc fails in Xregion.h:MEMCHECK macro

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Avoid memory leak/corruption if realloc fails in Xregion.h:MEMCHECK macro
105cd471 · Alan Coopersmith · Ulrich Sibiller · 180991ce · 105cd471
Commit 105cd471 authored Aug 10, 2013 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Xregion.h nx-X11/lib/X11/Xregion.h +4 -3

No files found.
--- a/nx-X11/lib/X11/Xregion.h
+++ b/nx-X11/lib/X11/Xregion.h
@@ -113,10 +113,11 @@ typedef struct _XRegion {
 */
 #define MEMCHECK(reg, rect, firstrect){\
        if ((reg)->numRects >= ((reg)->size - 1)){\
-          (firstrect) = (BOX *) Xrealloc \
-          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
-          if ((firstrect) == 0)\
+          BoxPtr tmpRect = Xrealloc ((firstrect), \
+                                     (2 * (sizeof(BOX)) * ((reg)->size))); \
+          if (tmpRect == NULL) \
            return(0);\
+          (firstrect) = tmpRect; \
          (reg)->size *= 2;\
          (rect) = &(firstrect)[(reg)->numRects];\
         }\