1 files changed, 16 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index 1644d51a4..abc228e9c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -2609,8 +2609,24 @@ void nxagentCreateDrawableBitmap(DrawablePtr pDrawable)
     goto nxagentCreateDrawableBitmapEnd;
   }
 
+  /*
+   * FIXME: A better way it would be create the bitmap
+   * with the same extents of the clipRegion. This
+   * requires to save the offset with respect to the
+   * drawable origin like in the backing store.
+   */
+
   pBitmap = nxagentCreatePixmap(pDrawable -> pScreen, pDrawable -> width, pDrawable -> height, pDrawable -> depth);
 
+  if (pBitmap == NULL)
+  {
+    #ifdef WARNING
+    fprintf(stderr, "nxagentCreateDrawableBitmap: Cannot create pixmap for the bitmap data.\n");
+    #endif
+
+    goto nxagentCreateDrawableBitmapEnd;
+  }
+
   pGC = GetScratchGC(pBitmap -> drawable.depth, pBitmap -> drawable.pScreen);
 
   ValidateGC((DrawablePtr) pBitmap, pGC);