Compext.c: use SAFE_free macro

nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c

@@ -38,6 +38,8 @@
 #include "Mask.h"
 #include "Jpeg.h"
 
+#include "../Utils.h"
+
 #define PANIC
 #define WARNING
 #undef  TEST
@@ -277,7 +279,7 @@ char *JpegCompressData(XImage *image, int level, int *compressed_size)
                 jpegError);
     #endif
 
-    free(jpegCompBuf);
+    SAFE_free(jpegCompBuf);
 
     return NULL;
   }
@@ -326,7 +328,7 @@ char *JpegCompressData(XImage *image, int level, int *compressed_size)
                 jpegDstDataLen);
     #endif
 
-    free(jpegCompBuf);
+    SAFE_free(jpegCompBuf);
 
     return NULL;
   }

nx-X11/programs/Xserver/hw/nxagent/compext/Png.c

@@ -34,6 +34,8 @@
 #include "Mask.h"
 #include "Png.h"
 
+#include "../Utils.h"
+
 #define PANIC
 #define WARNING
 #undef  TEST
@@ -361,7 +363,7 @@ char *PngCompressData(XImage *image, int *compressed_size)
     #endif
 
     png_destroy_write_struct(&png_ptr, &info_ptr);
-    free(pngCompBuf);
+    SAFE_free(pngCompBuf);
 
     return NULL;
   }
@@ -373,7 +375,7 @@ char *PngCompressData(XImage *image, int *compressed_size)
     fprintf(stderr, "******PngCompressData: PANIC! Could not alloc image_index.\n");
     #endif
 
-    free(pngCompBuf);
+    SAFE_free(pngCompBuf);
     return NULL;
   }
 
@@ -475,8 +477,8 @@ char *PngCompressData(XImage *image, int *compressed_size)
 
     png_destroy_write_struct(&png_ptr, &info_ptr);
 
-    free(pngCompBuf);
-    free(image_index);
+    SAFE_free(pngCompBuf);
+    SAFE_free(image_index);
 
     return NULL;
   }
@@ -500,8 +502,8 @@ char *PngCompressData(XImage *image, int *compressed_size)
                   (int) (count * sizeof(CARD8)));
     #endif
 
-    free(pngCompBuf);
-    free(image_index);
+    SAFE_free(pngCompBuf);
+    SAFE_free(image_index);
 
     return NULL;
   }
@@ -532,8 +534,8 @@ char *PngCompressData(XImage *image, int *compressed_size)
               dy, h);
   #endif
 
-  free(srcBuf); srcBuf = NULL;
-  free(image_index); image_index = NULL;
+  SAFE_free(srcBuf);
+  SAFE_free(image_index);
 
   if (setjmp(png_jmpbuf(png_ptr)))
   {
@@ -543,7 +545,7 @@ char *PngCompressData(XImage *image, int *compressed_size)
 
     png_destroy_write_struct(&png_ptr, &info_ptr);
 
-    free(pngCompBuf);
+    SAFE_free(pngCompBuf);
 
     return NULL;
   }
@@ -594,7 +596,7 @@ char *PngCompressData(XImage *image, int *compressed_size)
                 pngDataLen);
     #endif
 
-    free(pngCompBuf);
+    SAFE_free(pngCompBuf);
 
     return NULL;
   }

nx-X11/programs/Xserver/hw/nxagent/compext/Z.c

@@ -33,6 +33,8 @@
 
 #include "Z.h"
 
+#include "../Utils.h"
+
 #define PANIC
 #define WARNING
 #undef  TEST
@@ -129,7 +131,7 @@ char *ZCompressData(const char *plainData, unsigned int plainSize, int threshold
                   plainSize, zError(result));
       #endif
 
-      free(compressedData);
+      SAFE_free(compressedData);
 
       *compressedSize = 0;
 
@@ -300,7 +302,7 @@ int ZResetEncoder(void)
       #endif
     }
 
-    free(zStream);
+    SAFE_free(zStream);
   }
 
   zInitialized = 0;