[X2Go-Commits] [nx-libs] 140/219: Rootless.c: use SAFE_free and SAFE_XFree

[git-admin at x2go.org]

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 4a826d30f911dbf4552b92192dbbb2d91d34e33f
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Jul 22 21:29:31 2019 +0200

    Rootless.c: use SAFE_free and SAFE_XFree
---
 nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index c2611c194..6908799b6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -281,10 +281,7 @@ Bool nxagentRootlessTreesMatch(void)
     }
   }
 
-  if (children_return)
-  {
-    XFree(children_return);
-  }
+  SAFE_XFree(children_return);
 
   return treesMatch;
 }
@@ -332,7 +329,7 @@ void nxagentRootlessRestack(unsigned long children[], unsigned int nchildren)
 
   if (!ntoplevel)
   {
-    free(toplevel);
+    SAFE_free(toplevel);
     return;
   }
 
@@ -397,7 +394,7 @@ void nxagentRootlessRestack(unsigned long children[], unsigned int nchildren)
 
   #endif
 
-  free(toplevel);
+  SAFE_free(toplevel);
 
   return;
 }
@@ -818,7 +815,7 @@ int nxagentExportProperty(pWin, property, type, format, mode, nUnits, value)
 
   if (freeMem)
   {
-    free(output);
+    SAFE_free(output);
   }
 
   return export;
@@ -1131,7 +1128,7 @@ void nxagentImportProperty(Window window,
 
   if (freeMem)
   {
-    free(output);
+    SAFE_free(output);
   }
 
   return;
@@ -1183,7 +1180,7 @@ void nxagentRemovePropertyFromList(void)
       nxagentPropertyList.last = NULL;
     }
 
-    free(tmp);
+    SAFE_free(tmp);
   }
 }
 

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