Don't HeapFree() colormap if we didn't allocate one.

d982a71b · Marcus Meissner · Alexandre Julliard · 9cfe2d53 · d982a71b
Commit d982a71b authored Nov 01, 1998 by Marcus Meissner Committed by Alexandre Julliard Nov 01, 1998
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

dib.c objects/dib.c +3 -2

No files found.
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -1280,7 +1280,8 @@ INT32 WINAPI SetDIBits32( HDC32 hdc, HBITMAP32 hbitmap, UINT32 startscan,
            GDI_HEAP_UNLOCK( hdc );
            return 0;
        } 
-    }
+    } else
+    	descr.colorMap = 0;

    /* HACK for now */
    if(!bmp->DDBitmap)
@@ -1306,7 +1307,7 @@ INT32 WINAPI SetDIBits32( HDC32 hdc, HBITMAP32 hbitmap, UINT32 startscan,
    result = CALL_LARGE_STACK( DIB_SetImageBits, &descr );
    LeaveCriticalSection( &X11DRV_CritSection );

-    HeapFree(GetProcessHeap(), 0, descr.colorMap);
+    if (descr.colorMap) HeapFree(GetProcessHeap(), 0, descr.colorMap);

    GDI_HEAP_UNLOCK( hdc );
    GDI_HEAP_UNLOCK( hbitmap );