Merge branch 'uli42-pr/various5' into 3.6.x

Attributes GH PR #963: https://github.com/ArcticaProject/nx-libs/pull/963

10 files changed, 174 insertions, 239 deletions

diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c
index 6eab7f36d..e85ba33d7 100644
--- a/nx-X11/programs/Xserver/Xext/panoramiX.c
+++ b/nx-X11/programs/Xserver/Xext/panoramiX.c
@@ -601,8 +601,8 @@ extern Bool CreateConnectionBlock(void);
 Bool PanoramiXCreateConnectionBlock(void)
 {
     int i, j, length;
-    Bool disableBackingStore = FALSE;
-    Bool disableSaveUnders = FALSE;
+    Bool disable_backing_store = FALSE;
+    Bool disable_save_unders = FALSE;
     int old_width, old_height;
     float width_mult, height_mult;
     xWindowRoot *root;
@@ -627,17 +627,17 @@ Bool PanoramiXCreateConnectionBlock(void)
 	    return FALSE;
 	}
 	if(pScreen->backingStoreSupport != screenInfo.screens[0]->backingStoreSupport)
-	     disableBackingStore = TRUE;
+	     disable_backing_store = TRUE;
 	if(pScreen->saveUnderSupport != screenInfo.screens[0]->saveUnderSupport)
-	     disableSaveUnders = TRUE;
+	     disable_save_unders = TRUE;
     }
 
-    if(disableBackingStore || disableSaveUnders) {
+    if(disable_backing_store || disable_save_unders) {
     	for(i = 0; i < screenInfo.numScreens; i++) {
 	    pScreen = screenInfo.screens[i];
-	    if(disableBackingStore)
+	    if(disable_backing_store)
 		pScreen->backingStoreSupport = NotUseful;
-	    if(disableSaveUnders)
+	    if(disable_save_unders)
 		pScreen->saveUnderSupport = NotUseful;
 	}
     }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index 358d46519..52c75e805 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -42,7 +42,6 @@
 #include "Display.h"
 #include "Screen.h"
 #include "Options.h"
-#include "Agent.h"
 #include "Utils.h"
 
 /*
@@ -709,7 +708,7 @@ XlibAtom nxagentLocalToRemoteAtom(Atom local)
     if (current->string)
       fprintf(stderr, "%s: local [%d] -> remote [%d (%s)]\n", __func__, local, current->remote, current->string);
     else
-      fprintf(stderr, "%s: local [%d] -> remote [%d]\n", __func__, local, current->remote);
+      fprintf(stderr, "%s: local [%d] -> remote [%d] (no string cached)\n", __func__, local, current->remote);
     #endif
 
     return current->remote;
@@ -718,7 +717,7 @@ XlibAtom nxagentLocalToRemoteAtom(Atom local)
   {
     const char *string = NameForAtom(local);
 
-    /* FIXME: why False? */
+    /* False means "create Atom if it does not exist yet" */
     XlibAtom remote = XInternAtom(nxagentDisplay, string, False);
 
     if (remote == None)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 7ca22ffad..ceb47b669 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -292,7 +292,7 @@ static void printSelectionStat(int sel)
 #else
   fprintf(stderr, "  CurrentSelections[].client             [%p] index [%d]\n",
           (void *)curSel.client,
-          CLINDEX(curSel.client);
+          CLINDEX(curSel.client));
 #endif
   fprintf(stderr, "  CurrentSelections[].window             [0x%x]\n", curSel.window);
   return;
@@ -1937,17 +1937,23 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
      */
     XlibAtom p = serverTransToAgentProperty;
     XlibAtom t;
+    #ifdef DEBUG
     char * pstr = "NX_CUT_BUFFER_SERVER";
     const char * tstr;
+    #endif
     if (target == clientUTF8_STRING)
     {
       t = serverUTF8_STRING;
+      #ifdef DEBUG
       tstr = szAgentUTF8_STRING;
+      #endif
     }
     else
     {
       t = XA_STRING;
+      #ifdef DEBUG
       tstr = validateString(NameForAtom(XA_STRING));
+      #endif
     }
 
     #ifdef DEBUG
@@ -2025,11 +2031,12 @@ int nxagentSendNotify(xEvent *event)
    * communication happens completely between our own clients (some of
    * which can be nxagents themselves). In that case we return 0 (tell
    * dix to go on) and do nothing!
+   * Be sure to not let this trigger for the failure answer (property 0)
    */
-  if (event->u.selectionNotify.property != clientCutProperty || lastServerRequestor == None)
+  if (!(event->u.selectionNotify.property == clientCutProperty || event->u.selectionNotify.property == 0) || lastServerRequestor == None)
   {
     #ifdef DEBUG
-    fprintf(stderr, "%s: sent nothing.\n", __func__);
+    fprintf(stderr, "%s: sent nothing - message to real X server is not required.\n", __func__);
     #endif
     return 0;
   }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 4d9d32bb2..2487db69f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -2851,10 +2851,10 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X)
   fprintf(stderr, "%s: Handling event.\n", __func__);
   #endif
 
-  Atom local = nxagentRemoteToLocalAtom(xfixesEvent -> xfixesselection.selection);
-
   if (SelectionCallback)
   {
+    Atom local = nxagentRemoteToLocalAtom(xfixesEvent -> xfixesselection.selection);
+
     int i = nxagentFindCurrentSelectionIndex(local);
     if (i < NumCurrentSelections)
     {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCs.h b/nx-X11/programs/Xserver/hw/nxagent/GCs.h
index 84b0063ab..51ec85af0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCs.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCs.h
@@ -42,7 +42,7 @@ is" without express or implied warranty.
 
 extern RESTYPE RT_NX_GC;
 
-/* This file uses the GC definition form Xlib.h as XlibGC. */
+/* This file uses the GC definition from Xlib.h as XlibGC. */
 
 typedef struct {
   XlibGC gc;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index f8507aa59..148f9e1dd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -341,7 +341,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
   XUnmapWindow(nxagentDisplay, nxagentIconWindow);
 */
 
-    Window root = RootWindow(nxagentDisplay, DefaultScreen(nxagentDisplay));
+  Window root = RootWindow(nxagentDisplay, DefaultScreen(nxagentDisplay));
 
 /*
 FIXME: We'll check for ReparentNotify and LeaveNotify events after
@@ -351,55 +351,55 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
        unnecessary.
 */
 
-    /* only reparent if necessary. FIXME: also check if the desired coordinates match */
+  /* only reparent if necessary. FIXME: also check if the desired coordinates match */
 
-    if (!nxagentIsParentOf(nxagentDisplay, root, nxagentFullscreenWindow))
-    {
-      XReparentWindow(nxagentDisplay, nxagentFullscreenWindow,
-                      root, 0, 0);
+  if (!nxagentIsParentOf(nxagentDisplay, root, nxagentFullscreenWindow))
+  {
+    XReparentWindow(nxagentDisplay, nxagentFullscreenWindow,
+                        root, 0, 0);
 
-      for (int i = 0; i < 100 && nxagentWMIsRunning; i++)
-      {
-        XEvent e;
+    for (int i = 0; i < 100 && nxagentWMIsRunning; i++)
+    {
+      XEvent e;
 
-        #ifdef TEST
-        fprintf(stderr, "nxagentMaximizeToFullscreen: WARNING! Going to wait for the ReparentNotify event [%d].\n", i);
-        #endif
+      #ifdef TEST
+      fprintf(stderr, "nxagentMaximizeToFullscreen: WARNING! Going to wait for the ReparentNotify event [%d].\n", i);
+      #endif
 
-        if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e))
-        {
-          break;
-        }
+      if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e))
+      {
+        break;
+      }
 
-        XSync(nxagentDisplay, 0);
+      XSync(nxagentDisplay, 0);
 
-        nxagentWaitEvents(nxagentDisplay, 50);
-      }
-    }
-    else
-    {
-      #ifdef TEST
-      fprintf(stderr, "%s: FullscreenWindow already is child of root window - skipping reparenting,\n", __func__);
-      #endif
+      nxagentWaitEvents(nxagentDisplay, 50);
     }
+  }
+  else
+  {
+    #ifdef TEST
+    fprintf(stderr, "%s: FullscreenWindow already is child of root window - skipping reparenting,\n", __func__);
+    #endif
+  }
 
   XMapRaised(nxagentDisplay, nxagentFullscreenWindow);
 
   XIconifyWindow(nxagentDisplay, nxagentIconWindow,
                      DefaultScreen(nxagentDisplay));
 
-    /* swallow all LeaveNotify events for the FullscreenWindow;
-       Normally this does not swallow anything these days, but when
-       using fvwm you see one of these events here. */
-    while (1)
-    {
-      XEvent e;
-      if (!XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, LeaveNotify, &e))
-        break;
-      #ifdef TEST
-      fprintf(stderr, "%s: swallowing LeaveNotify event\n", __func__);
-      #endif
-    }
+  /* swallow all LeaveNotify events for the FullscreenWindow;
+     Normally this does not swallow anything these days, but when
+     using fvwm you see one of these events here. */
+  while (1)
+  {
+    XEvent e;
+    if (!XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, LeaveNotify, &e))
+      break;
+    #ifdef TEST
+    fprintf(stderr, "%s: swallowing LeaveNotify event\n", __func__);
+    #endif
+  }
 
 /*
   XMapWindow(nxagentDisplay, nxagentIconWindow);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
index 3492ef473..4a8dacaf4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
@@ -69,6 +69,7 @@
 #include "Rle.h"
 #include "Z.h"
 
+#include "../Utils.h"
 
 #define PANIC
 #define WARNING
@@ -345,7 +346,7 @@ int _NXInternalResetResources(Display *dpy)
       {
         DeqAsyncHandler(dpy, _NXCollectedImages[i] -> handler);
 
-        free(_NXCollectedImages[i] -> handler);
+        SAFE_free(_NXCollectedImages[i] -> handler);
       }
 
       if (_NXCollectedImages[i] -> image != NULL)
@@ -353,9 +354,7 @@ int _NXInternalResetResources(Display *dpy)
         XDestroyImage(_NXCollectedImages[i] -> image);
       }
 
-      free(_NXCollectedImages[i]);
-
-      _NXCollectedImages[i] = NULL;
+      SAFE_free(_NXCollectedImages[i]);
     }
 
     if (_NXCollectedProperties[i] != NULL)
@@ -369,17 +368,12 @@ int _NXInternalResetResources(Display *dpy)
       {
         DeqAsyncHandler(dpy, _NXCollectedProperties[i] -> handler);
 
-        free(_NXCollectedProperties[i] -> handler);
-      }
-
-      if (_NXCollectedProperties[i] -> data != NULL)
-      {
-        free(_NXCollectedProperties[i] -> data);
+        SAFE_free(_NXCollectedProperties[i] -> handler);
       }
 
-      free(_NXCollectedProperties[i]);
+      SAFE_free(_NXCollectedProperties[i] -> data);
 
-      _NXCollectedProperties[i] = NULL;
+      SAFE_free(_NXCollectedProperties[i]);
     }
 
     if (_NXCollectedGrabPointers[i] != NULL)
@@ -393,12 +387,10 @@ int _NXInternalResetResources(Display *dpy)
       {
         DeqAsyncHandler(dpy, _NXCollectedGrabPointers[i] -> handler);
 
-        free(_NXCollectedGrabPointers[i] -> handler);
+        SAFE_free(_NXCollectedGrabPointers[i] -> handler);
       }
 
-      free(_NXCollectedGrabPointers[i]);
-
-      _NXCollectedGrabPointers[i] = NULL;
+      SAFE_free(_NXCollectedGrabPointers[i]);
     }
 
     if (_NXCollectedInputFocuses[i] != NULL)
@@ -412,12 +404,10 @@ int _NXInternalResetResources(Display *dpy)
       {
         DeqAsyncHandler(dpy, _NXCollectedInputFocuses[i] -> handler);
 
-        free(_NXCollectedInputFocuses[i] -> handler);
+        SAFE_free(_NXCollectedInputFocuses[i] -> handler);
       }
 
-      free(_NXCollectedInputFocuses[i]);
-
-      _NXCollectedInputFocuses[i] = NULL;
+      SAFE_free(_NXCollectedInputFocuses[i]);
     }
   }
 
@@ -488,10 +478,7 @@ int NXSetDisplayBuffer(Display *dpy, int size)
     return -1;
   }
 
-  if (dpy -> buffer != NULL)
-  {
-    free(dpy -> buffer);
-  }
+  SAFE_free(dpy -> buffer);
 
   dpy -> buffer = buffer;
   dpy -> bufptr = dpy -> buffer;
@@ -2190,7 +2177,7 @@ NXPackedImage *NXPackImage(Display *dpy, XImage *src_image, unsigned int method)
                 dst_data_size);
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2224,9 +2211,9 @@ NXPackedImage *NXPackImage(Display *dpy, XImage *src_image, unsigned int method)
       fprintf(stderr, "******NXPackImage: PANIC! Failed to clean the image.\n");
       #endif
 
-      free(dst_image -> data);
+      SAFE_free(dst_image -> data);
 
-      free(dst_image);
+      SAFE_free(dst_image);
 
       return NULL;
     }
@@ -2237,9 +2224,9 @@ NXPackedImage *NXPackImage(Display *dpy, XImage *src_image, unsigned int method)
     fprintf(stderr, "******NXPackImage: PANIC! Failed to apply the color mask.\n");
     #endif
 
-    free(dst_image -> data);
+    SAFE_free(dst_image -> data);
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2273,9 +2260,9 @@ NXPackedImage *NXPackImage(Display *dpy, XImage *src_image, unsigned int method)
                 dst_bits_per_pixel, dst_packed_bits_per_pixel);
     #endif
 
-    free(dst_image -> data);
+    SAFE_free(dst_image -> data);
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2397,7 +2384,7 @@ XImage *NXInPlacePackImage(Display *dpy, XImage *src_image, unsigned int method)
       fprintf(stderr, "******NXInPlacePackImage: PANIC! Failed to clean the image.\n");
       #endif
 
-      free(dst_image);
+      SAFE_free(dst_image);
 
       return NULL;
     }
@@ -2408,7 +2395,7 @@ XImage *NXInPlacePackImage(Display *dpy, XImage *src_image, unsigned int method)
     fprintf(stderr, "******NXInPlacePackImage: PANIC! Failed to apply the color mask.\n");
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2671,7 +2658,7 @@ NXPackedImage *NXEncodeRgb(XImage *src_image, unsigned int method, unsigned int
     fprintf(stderr, "******NXEncodeRgb: PANIC! Rgb compression failed.\n");
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2716,7 +2703,7 @@ NXPackedImage *NXEncodeRle(XImage *src_image, unsigned int method, unsigned int
     fprintf(stderr, "******NXEncodeRle: PANIC! Rle compression failed.\n");
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2761,7 +2748,7 @@ NXPackedImage *NXEncodeBitmap(XImage *src_image, unsigned int method, unsigned i
     fprintf(stderr, "******NXEncodeBitmap: PANIC! Bitmap compression failed.\n");
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2821,7 +2808,7 @@ NXPackedImage *NXEncodeJpeg(XImage *src_image, unsigned int method, unsigned int
     fprintf(stderr, "******NXEncodeJpeg: PANIC! Jpeg compression failed.\n");
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -2876,7 +2863,7 @@ NXPackedImage *NXEncodePng(XImage *src_image, unsigned int method, unsigned int
     fprintf(stderr, "******NXEncodePng: PANIC! Png compression failed.\n");
     #endif
 
-    free(dst_image);
+    SAFE_free(dst_image);
 
     return NULL;
   }
@@ -3151,12 +3138,7 @@ void NXInitCache(Display *dpy, int entries)
 
   NXImageCacheSize = 0;
 
-  if (NXImageCache != NULL)
-  {
-    free(NXImageCache);
-
-    NXImageCache = NULL;
-  }
+  SAFE_free(NXImageCache);
 
   if (entries > 0)
   {
@@ -3212,7 +3194,7 @@ XImage *NXCacheFindImage(NXPackedImage *src_image, unsigned int *method, unsigne
 {
   md5_state_t  new_state;
   md5_byte_t   *new_md5;
-  unsigned int data_size, i;
+  unsigned int data_size;
 
   if (NXImageCache == NULL)
   {
@@ -3246,7 +3228,7 @@ XImage *NXCacheFindImage(NXPackedImage *src_image, unsigned int *method, unsigne
 
   md5_finish(&new_state, new_md5);
 
-  for (i = 0; i < NXImageCacheSize; i++)
+  for (unsigned int i = 0; i < NXImageCacheSize; i++)
   {
     if (NXImageCache[i].image != NULL)
     {
@@ -3267,7 +3249,7 @@ XImage *NXCacheFindImage(NXPackedImage *src_image, unsigned int *method, unsigne
                     i, NXImageCacheHits, NXImageCacheOps);
         #endif
 
-        free(new_md5);
+        SAFE_free(new_md5);
 
         /*
          * Move the images down one slot, from
@@ -3344,9 +3326,9 @@ int NXCacheAddImage(NXPackedImage *image, unsigned int method, unsigned char *md
 
     i--;
 
-    free(NXImageCache[NXImageCacheSize - 1].image -> data);
-    free(NXImageCache[NXImageCacheSize - 1].image);
-    free(NXImageCache[NXImageCacheSize - 1].md5);
+    SAFE_free(NXImageCache[NXImageCacheSize - 1].image -> data);
+    SAFE_free(NXImageCache[NXImageCacheSize - 1].image);
+    SAFE_free(NXImageCache[NXImageCacheSize - 1].md5);
   }
 
   if (i > 0)
@@ -3400,27 +3382,14 @@ void NXFreeCache(Display *dpy)
   {
     if (NXImageCache[i].image != NULL)
     {
-      if (NXImageCache[i].image -> data != NULL)
-      {
-        free(NXImageCache[i].image -> data);
-      }
-
-      free(NXImageCache[i].image);
-
-      NXImageCache[i].image = NULL;
+      SAFE_free(NXImageCache[i].image -> data);
+      SAFE_free(NXImageCache[i].image);
     }
 
-    if (NXImageCache[i].md5 != NULL)
-    {
-      free(NXImageCache[i].md5);
-
-      NXImageCache[i].md5 = NULL;
-    }
+    SAFE_free(NXImageCache[i].md5);
   }
 
-  free(NXImageCache);
-
-  NXImageCache = NULL;
+  SAFE_free(NXImageCache);
 
   NXImageCacheSize = 0;
   NXImageCacheHits = 0;
@@ -3490,9 +3459,7 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
   DeqAsyncHandler(dpy, state -> handler);
 
-  free(state -> handler);
-
-  state -> handler = NULL;
+  SAFE_free(state -> handler);
 
   if (rep -> generic.type == X_Error)
   {
@@ -3505,7 +3472,7 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedImages[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -3530,7 +3497,7 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedImages[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -3553,9 +3520,9 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedImages[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
-    free(async_head);
+    SAFE_free(async_head);
 
     return False;
   }
@@ -3582,9 +3549,9 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
       _NXCollectedImages[state -> resource] = NULL;
 
-      free(state);
+      SAFE_free(state);
 
-      free(async_head);
+      SAFE_free(async_head);
 
       return False;
     }
@@ -3628,10 +3595,10 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
       _NXCollectedImages[state -> resource] = NULL;
 
-      free(state);
+      SAFE_free(state);
 
-      free(async_head);
-      free(async_data);
+      SAFE_free(async_head);
+      SAFE_free(async_data);
 
       return True;
     }
@@ -3651,7 +3618,7 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
 
   _NXNotifyImage(dpy, state -> resource, True);
 
-  free(async_head);
+  SAFE_free(async_head);
 
   return True;
 }
@@ -3703,7 +3670,7 @@ int NXCollectImage(Display *dpy, unsigned int resource, Drawable drawable,
     {
       DeqAsyncHandler(dpy, state -> handler);
 
-      free(state -> handler);
+      SAFE_free(state -> handler);
     }
 
     if (state -> image != NULL)
@@ -3711,7 +3678,7 @@ int NXCollectImage(Display *dpy, unsigned int resource, Drawable drawable,
       XDestroyImage(state -> image);
     }
 
-    free(state);
+    SAFE_free(state);
 
     _NXCollectedImages[resource] = NULL;
   }
@@ -3751,15 +3718,8 @@ int NXCollectImage(Display *dpy, unsigned int resource, Drawable drawable,
 
     UnGetReq(GetImage);
 
-    if (state != NULL)
-    {
-      free(state);
-    }
-
-    if (handler != NULL)
-    {
-      free(handler);
-    }
+    SAFE_free(state);
+    SAFE_free(handler);
 
     UnlockDisplay(dpy);
 
@@ -3810,7 +3770,7 @@ int NXGetCollectedImage(Display *dpy, unsigned int resource, XImage **image)
 
   *image = state -> image;
 
-  free(state);
+  SAFE_free(state);
 
   #ifdef TEST
   fprintf(stderr, "******NXGetCollectedImage: Returning GetImage data for resource [%u].\n",
@@ -3883,9 +3843,7 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
 
   DeqAsyncHandler(dpy, state -> handler);
 
-  free(state -> handler);
-
-  state -> handler = NULL;
+  SAFE_free(state -> handler);
 
   if (rep -> generic.type == X_Error)
   {
@@ -3898,7 +3856,7 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedProperties[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -3923,7 +3881,7 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedProperties[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -3946,9 +3904,9 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedProperties[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
-    free(async_head);
+    SAFE_free(async_head);
 
     return False;
   }
@@ -3983,9 +3941,9 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
 
       _NXCollectedProperties[state -> resource] = NULL;
 
-      free(state);
+      SAFE_free(state);
 
-      free(async_head);
+      SAFE_free(async_head);
 
       return False;
     }
@@ -4019,16 +3977,14 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
 
   _NXNotifyProperty(dpy, state -> resource, True);
 
-  free(async_head);
+  SAFE_free(async_head);
 
   return True;
 }
 
 int NXGetCollectPropertyResource(Display *dpy)
 {
-  int i;
-
-  for (i = 0; i < NXNumberOfResources; i++)
+  for (int i = 0; i < NXNumberOfResources; i++)
   {
     if (_NXCollectedProperties[i] == NULL)
     {
@@ -4070,15 +4026,11 @@ int NXCollectProperty(Display *dpy, unsigned int resource, Window window, Atom p
     {
       DeqAsyncHandler(dpy, state -> handler);
 
-      free(state -> handler);
+      SAFE_free(state -> handler);
     }
 
-    if (state -> data != NULL)
-    {
-      free(state -> data);
-    }
-
-    free(state);
+    SAFE_free(state->data);
+    SAFE_free(state);
 
     _NXCollectedProperties[resource] = NULL;
   }
@@ -4115,15 +4067,8 @@ int NXCollectProperty(Display *dpy, unsigned int resource, Window window, Atom p
                 resource);
     #endif
 
-    if (state != NULL)
-    {
-      free(state);
-    }
-
-    if (handler != NULL)
-    {
-      free(handler);
-    }
+    SAFE_free(state);
+    SAFE_free(handler);
 
     UnGetReq(GetProperty);
 
@@ -4183,7 +4128,7 @@ int NXGetCollectedProperty(Display *dpy, unsigned int resource, Atom *actual_typ
 
   *data = (unsigned char *) _NXCollectedProperties[resource] -> data;
 
-  free(state);
+  SAFE_free(state);
 
   _NXCollectedProperties[resource] = NULL;
 
@@ -4245,9 +4190,7 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
 
   DeqAsyncHandler(dpy, state -> handler);
 
-  free(state -> handler);
-
-  state -> handler = NULL;
+  SAFE_free(state -> handler);
 
   if (rep -> generic.type == X_Error)
   {
@@ -4260,7 +4203,7 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedGrabPointers[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -4285,7 +4228,7 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedGrabPointers[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -4308,9 +4251,9 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedGrabPointers[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
-    free(async_head);
+    SAFE_free(async_head);
 
     return False;
   }
@@ -4324,16 +4267,14 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
 
   _NXNotifyGrabPointer(dpy, state -> resource, True);
 
-  free(async_head);
+  SAFE_free(async_head);
 
   return True;
 }
 
 int NXGetCollectGrabPointerResource(Display *dpy)
 {
-  int i;
-
-  for (i = 0; i < NXNumberOfResources; i++)
+  for (int i = 0; i < NXNumberOfResources; i++)
   {
     if (_NXCollectedGrabPointers[i] == NULL)
     {
@@ -4376,10 +4317,10 @@ int NXCollectGrabPointer(Display *dpy, unsigned int resource, Window grab_window
     {
       DeqAsyncHandler(dpy, state -> handler);
 
-      free(state -> handler);
+      SAFE_free(state -> handler);
     }
 
-    free(state);
+    SAFE_free(state);
 
     _NXCollectedGrabPointers[resource] = NULL;
   }
@@ -4412,15 +4353,9 @@ int NXCollectGrabPointer(Display *dpy, unsigned int resource, Window grab_window
                 resource);
     #endif
 
-    if (state != NULL)
-    {
-      free(state);
-    }
+    SAFE_free(state);
 
-    if (handler != NULL)
-    {
-      free(handler);
-    }
+    SAFE_free(handler);
 
     UnGetReq(GrabPointer);
 
@@ -4467,7 +4402,7 @@ int NXGetCollectedGrabPointer(Display *dpy, unsigned int resource, int *status)
 
   *status = state -> status;
 
-  free(state);
+  SAFE_free(state);
 
   _NXCollectedGrabPointers[resource] = NULL;
 
@@ -4529,9 +4464,7 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
 
   DeqAsyncHandler(dpy, state -> handler);
 
-  free(state -> handler);
-
-  state -> handler = NULL;
+  SAFE_free(state -> handler);
 
   if (rep -> generic.type == X_Error)
   {
@@ -4544,7 +4477,7 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedInputFocuses[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -4569,7 +4502,7 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedInputFocuses[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
     return False;
   }
@@ -4592,9 +4525,9 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
 
     _NXCollectedInputFocuses[state -> resource] = NULL;
 
-    free(state);
+    SAFE_free(state);
 
-    free(async_head);
+    SAFE_free(async_head);
 
     return False;
   }
@@ -4610,16 +4543,14 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
 
   _NXNotifyInputFocus(dpy, state -> resource, True);
 
-  free(async_head);
+  SAFE_free(async_head);
 
   return True;
 }
 
 int NXGetCollectInputFocusResource(Display *dpy)
 {
-  int i;
-
-  for (i = 0; i < NXNumberOfResources; i++)
+  for (int i = 0; i < NXNumberOfResources; i++)
   {
     if (_NXCollectedInputFocuses[i] == NULL)
     {
@@ -4660,10 +4591,10 @@ int NXCollectInputFocus(Display *dpy, unsigned int resource)
     {
       DeqAsyncHandler(dpy, state -> handler);
 
-      free(state -> handler);
+      SAFE_free(state -> handler);
     }
 
-    free(state);
+    SAFE_free(state);
 
     _NXCollectedInputFocuses[resource] = NULL;
   }
@@ -4687,15 +4618,9 @@ int NXCollectInputFocus(Display *dpy, unsigned int resource)
                 resource);
     #endif
 
-    if (state != NULL)
-    {
-      free(state);
-    }
+    SAFE_free(state);
 
-    if (handler != NULL)
-    {
-      free(handler);
-    }
+    SAFE_free(handler);
 
     UnGetEmptyReq();
 
@@ -4745,7 +4670,7 @@ int NXGetCollectedInputFocus(Display *dpy, unsigned int resource,
   *focus_return     = state -> focus;
   *revert_to_return = state -> revert_to;
 
-  free(state);
+  SAFE_free(state);
 
   _NXCollectedInputFocuses[resource] = NULL;
 
@@ -4765,13 +4690,11 @@ void _NXDumpData(const unsigned char *buffer, unsigned int size)
   {
     unsigned int i = 0;
 
-    unsigned int ii;
-
     while (i < size)
     {
       fprintf(stderr, "[%d]\t", i);
 
-      for (ii = 0; i < size && ii < 8; i++, ii++)
+      for (unsinged int ii = 0; i < size && ii < 8; i++, ii++)
       {
         fprintf(stderr, "%d\t", (unsigned int) (buffer[i]));
       }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c
index 690a934f6..bdf3d927a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Jpeg.c
+++ b/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;
   }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c
index 5c3a27612..48acb6e88 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Png.c
+++ b/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,20 +596,20 @@ char *PngCompressData(XImage *image, int *compressed_size)
                 pngDataLen);
     #endif
 
-    free(pngCompBuf);
+    SAFE_free(pngCompBuf);
 
     return NULL;
   }
 }
 
-static void PngWriteData(png_structp png_ptr, png_bytep data, png_size_t length)
+static void PngWriteData(png_structp _png_ptr, png_bytep data, png_size_t length)
 {
-  memcpy(((char *) png_get_io_ptr(png_ptr) + pngDataLen), data, length);
+  memcpy(((char *) png_get_io_ptr(_png_ptr) + pngDataLen), data, length);
 
   pngDataLen += length;
 }
 
-static void PngFlushData(png_structp png_ptr)
+static void PngFlushData(png_structp _png_ptr)
 {
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
index 9bf59eaf2..978032c28 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Z.c
+++ b/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;