Prevent bomb when GDI_ObjPtr returns null object.

342b5a86 · Guy L. Albertelli · Alexandre Julliard · 92bb19fe · 342b5a86
Commit 342b5a86 authored Sep 07, 2001 by Guy L. Albertelli Committed by Alexandre Julliard Sep 07, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

bitmap.c graphics/x11drv/bitmap.c +8 -2

No files found.
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -595,8 +595,14 @@ Pixmap X11DRV_BITMAP_Pixmap(HBITMAP hbitmap)
 {
    Pixmap pixmap;
    BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
-    pixmap = (Pixmap)bmp->physBitmap;
-    GDI_ReleaseObj( hbitmap );
+    if (bmp) {
+      pixmap = (Pixmap)bmp->physBitmap;
+      GDI_ReleaseObj( hbitmap );
+    }
+    else {
+      ERR("handle %08x returned no obj\n", hbitmap);
+      pixmap = 0;
+    }
    return pixmap;
 }