gdiplus: Avoid dereferencing a potential NULL (Coverity 589).

c4e859a6 · Aric Stewart · Alexandre Julliard · 8ed05aeb · c4e859a6
Commit c4e859a6 authored Oct 16, 2008 by Aric Stewart Committed by Alexandre Julliard Oct 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

image.c dlls/gdiplus/image.c +3 -1

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -450,7 +450,9 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride,

    TRACE("%d %d %d %d %p %p\n", width, height, stride, format, scan0, bitmap);

-    if(!bitmap || width <= 0 || height <= 0 || (scan0 && (stride % 4))){
+    if (!bitmap) return InvalidParameter;
+
+    if(width <= 0 || height <= 0 || (scan0 && (stride % 4))){
        *bitmap = NULL;
        return InvalidParameter;
    }