commit 8903e536fb897e7c4093ab459de915b6ad80911b
author Pascal Lessard <pascal@macadamian.com> Sat May 22 10:39:00 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat May 22 10:39:00 1999 +0000
tree 9a389a448b98cf183821c12ea741d2c9ef845828
parent 090e2d873e928ff74a2b6bc082a99eada88cd59a

Add some null checking in the Get/SetBitmapBits functions.

objects/bitmap.c

diff --git a/objects/bitmap.c b/objects/bitmap.c
index c4f7029..a75de2f 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -244,6 +244,10 @@
     LONG height, ret;
     
     if (!bmp) return 0;
+    
+    /* If the bits vector is null, the function should return the read size */
+    if(bits == NULL)
+	return bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight;
 
     if (count < 0) {
 	WARN_(bitmap)("(%ld): Negative number of bytes passed???\n", count );
@@ -318,7 +322,8 @@
     BITMAPOBJ *bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     LONG height, ret;
     
-    if (!bmp) return 0;
+    if ((!bmp) || (!bits))
+	return 0;
 
     if (count < 0) {
 	WARN_(bitmap)("(%ld): Negative number of bytes passed???\n", count );