reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Simplify the error handling in BITMAP_Load().

Browse Source 
This fixes a memleak on an error path (Smatch).
This commit is contained in:
Michael Stefaniuc 2010-09-28 22:45:21 +02:00 committed by Alexandre Julliard
parent ef24756291
commit 5a2cc94105
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/user32/cursoricon.c
View File

@ -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;