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/GCOps.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/GCOps.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/GCOps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index beb9ef05f..6ab46c424 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -57,6 +57,7 @@ is" without express or implied warranty. #include "Holder.h" #include "Args.h" #include "Screen.h" +#include "Utils.h" #include "compext/Compext.h" @@ -787,7 +788,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, srcx, srcy, width, height); #endif - free(data); + SAFE_free(data); /* * If the source is a shared memory pixmap, the @@ -1007,7 +1008,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, srcx, srcy, width, height); #endif - free(data); + SAFE_free(data); /* * If the source is a shared memory pixmap, the @@ -1545,7 +1546,7 @@ void nxagentFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, RESET_GC_TRAP(); } - free(newPoints); + SAFE_free(newPoints); } void nxagentPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, |