aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Render.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:42 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:42 +0200
commit6f80a06fb96725e7eadf846bf0e727821aadbf47 (patch)
tree64846b3be22e28618ffe285db02d55fa5d4de709 /nx-X11/programs/Xserver/hw/nxagent/Render.c
parent8b15d574b49857cdf4df0fd813d68b750d8aee5f (diff)
parentf39b81d31bc7d0427ea9cca04d0e4a21579d7383 (diff)
downloadnx-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/Render.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c
index 9d91b1ff1..ebc1fe287 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c
@@ -45,6 +45,7 @@
#include "Drawable.h"
#include "Trap.h"
#include "Args.h"
+#include "Utils.h"
#define Atom XlibAtom
#define Pixmap XlibPixmap
@@ -2528,7 +2529,7 @@ void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi,
if (normalizedImages != images)
{
- free(normalizedImages);
+ SAFE_free(normalizedImages);
}
#ifdef DEBUG
@@ -2636,7 +2637,7 @@ FIXME: Is this useful or just a waste of bandwidth?
nparams);
#endif
- free(szFilter);
+ SAFE_free(szFilter);
}