[X2Go-Commits] [nx-libs] 151/219: Drawable.c: use SAFE_free

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:10:42 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit a9819436d8014e61c2d557bcd62124fe593be096
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Jul 22 22:22:31 2019 +0200

    Drawable.c: use SAFE_free
---
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 88f3da3a9..7574ec7b0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -42,6 +42,7 @@
 #include "Pixels.h"
 #include "Reconnect.h"
 #include "GCOps.h"
+#include "Utils.h"
 
 #include "compext/Compext.h"
 
@@ -365,7 +366,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask
   success = nxagentSynchronizeRegion(pDrawable, NullRegion, breakMask, owner);
 
 nxagentSynchronizeDrawableDataEnd:
-  free(data);
+  SAFE_free(data);
 
   return success;
 }
@@ -861,7 +862,7 @@ int nxagentSynchronizeRegion(DrawablePtr pDrawable, RegionPtr pRegion, unsigned
               #endif
             }
 
-            free(cmpData);
+            SAFE_free(cmpData);
           }
         }
         else
@@ -1058,7 +1059,7 @@ nxagentSynchronizeRegionFree:
     nxagentFreeRegion(pDrawable, clipRegion);
   }
 
-  free(data);
+  SAFE_free(data);
 
   RegionUninit(&exposeRegion);
 
@@ -2158,7 +2159,7 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel)
     fprintf(stderr, "nxagentGetColor: WARNING! Failed to create the XImage.\n");
     #endif
 
-    free(data);
+    SAFE_free(data);
 
     return -1;
   }
@@ -2384,7 +2385,7 @@ void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion)
     XFillRectangles(nxagentDisplay, nxagentDrawable(pDrawable), nxagentGC(pGC),
                         pRects, nrects);
 
-    free(pRects);
+    SAFE_free(pRects);
   }
 }
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list