diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:27:42 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:27:42 +0200 |
| commit | 6f80a06fb96725e7eadf846bf0e727821aadbf47 (patch) | |
| tree | 64846b3be22e28618ffe285db02d55fa5d4de709 /nx-X11/programs/Xserver/hw/nxagent/Rootless.c | |
| parent | 8b15d574b49857cdf4df0fd813d68b750d8aee5f (diff) | |
| parent | f39b81d31bc7d0427ea9cca04d0e4a21579d7383 (diff) | |
| download | nx-libs-6f80a06fb96725e7eadf846bf0e727821aadbf47.tar.gz nx-libs-6f80a06fb96725e7eadf846bf0e727821aadbf47.tar.bz2 nx-libs-6f80a06fb96725e7eadf846bf0e727821aadbf47.zip | |
Merge branch 'uli42-pr/safe_free' into 3.6.x
Attributes GH PR #826: https://github.com/ArcticaProject/nx-libs/pull/826
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Rootless.c | 15 |
1 files 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); } } |