aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-07-22 21:45:25 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-08-06 21:57:32 +0200
commit8b74ff1c11f42943fbfdf247446676536d16f480 (patch)
tree283b678d8eb9827dcc540c7c8a7c93323e58b331
parent34bd0942baf5fedc038ded7507b130446edd611a (diff)
downloadnx-libs-8b74ff1c11f42943fbfdf247446676536d16f480.tar.gz
nx-libs-8b74ff1c11f42943fbfdf247446676536d16f480.tar.bz2
nx-libs-8b74ff1c11f42943fbfdf247446676536d16f480.zip
Pixmap.c: use SAFE_free
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixmap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 653426ebb..58fea6c05 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -49,6 +49,7 @@
#include "Events.h"
#include "Holder.h"
#include "Args.h"
+#include "Utils.h"
#include "compext/Compext.h"
#include <nx/NXpack.h>
@@ -501,7 +502,7 @@ Bool nxagentDestroyPixmap(PixmapPtr pPixmap)
FreeResource(pPixmapPriv -> mid, RT_NONE);
}
- free(pPixmap);
+ SAFE_free(pPixmap);
return True;
}
@@ -1092,7 +1093,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap)
{
FatalError("XGetImage: Failed.\n");
- free(data);
+ SAFE_free(data);
return False;
}
@@ -1168,7 +1169,7 @@ Bool nxagentCheckPixmapIntegrity(PixmapPtr pPixmap)
XDestroyImage(image);
}
- free(data);
+ SAFE_free(data);
}
else
{
@@ -1265,7 +1266,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict,
nxagentPutImage(pDrawable, pGC, depth, xPict, yPict,
width, height, 0, format, data);
- free(data);
+ SAFE_free(data);
}
#ifdef WARNING
else
@@ -1413,7 +1414,7 @@ FIXME: If the pixmap has a different depth from the window, the
fprintf(stderr, "nxagentPixmapOnShadowDisplay: XCreateImage failed.\n");
#endif
- free(data);
+ SAFE_free(data);
return False;
}
@@ -1572,7 +1573,7 @@ Bool nxagentFbOnShadowDisplay(void)
fprintf(stderr, "nxagentFbOnShadowDisplay: XCreateImage failed.\n");
#endif
- free(data);
+ SAFE_free(data);
return False;
}