ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Fix error handling in BITMAP_Load.

This commit is contained in:
Gerald Pfeifer 2010-09-19 16:10:39 +02:00 committed by Alexandre Julliard
parent ae0a15477c
commit 824ab969ff
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/user32/cursoricon.c
View File

@ -366,7 +366,7 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info )
* DIB_GetBitmapInfo * DIB_GetBitmapInfo
* *
* Get the info from a bitmap header. * Get the info from a bitmap header.
* Return 1 for INFOHEADER, 0 for COREHEADER, * Return 1 for INFOHEADER, 0 for COREHEADER, -1 in case of failure.
*/ */
static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
LONG *height, WORD *bpp, DWORD *compr ) LONG *height, WORD *bpp, DWORD *compr )
@ -2257,6 +2257,12 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
memcpy(scaled_info, fix_info, size); memcpy(scaled_info, fix_info, size);
bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height, bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height,
&bpp_dummy, &compr_dummy); &bpp_dummy, &compr_dummy);
if (bm_type == -1)
{
WARN("Invalid bitmap format!\n");
goto end_close;
}
if(desiredx != 0) if(desiredx != 0)
new_width = desiredx; new_width = desiredx;
else else