Skip to content

W
wine-winehq
Commit 5a2cc941 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

user32: Simplify the error handling in BITMAP_Load().

This fixes a memleak on an error path (Smatch).
parent ef247562
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
dlls/user32/cursoricon.c
View file @ 5a2cc941
......@@ -2291,7 +2291,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
if (bmfh->bfType != 0x4d42 /* 'BM' */)
{
WARN("Invalid/unsupported bitmap format!\n");
goto end_close;
goto end;
}
if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER);
}
......@@ -2312,7 +2312,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
if (bm_type == -1)
{
WARN("Invalid bitmap format!\n");
goto end_close;
goto end;
}
if(desiredx != 0)
......@@ -2371,7 +2371,6 @@ end:
if (screen_mem_dc) DeleteDC(screen_mem_dc);
HeapFree(GetProcessHeap(), 0, scaled_info);
HeapFree(GetProcessHeap(), 0, fix_info);
end_close:
if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr );
return hbitmap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment