reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-03 09:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors.

Browse Source 
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2018-01-23 09:44:23 +00:00 committed by Alexandre Julliard
parent 3bf32809b0
commit 82973cfbd1
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/gdi32/bitmap.c
View File

@ -145,6 +145,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
BITMAP bm;
BITMAPOBJ *bmpobj;
HBITMAP hbitmap;
INT dib_stride;
SIZE_T size;
if (!bmp || bmp->bmType)
{
@ -194,10 +196,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
/* Windows ignores the provided bm.bmWidthBytes */
bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel );
/* XP doesn't allow creating bitmaps larger than 128 MB */
if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes)
dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel );
size = dib_stride * bm.bmHeight;
/* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */
if (dib_stride != size / bm.bmHeight)
{
SetLastError( ERROR_NOT_ENOUGH_MEMORY );
SetLastError( ERROR_INVALID_PARAMETER );
return 0;
}
@ -209,10 +214,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
}
bmpobj->dib.dsBm = bm;
bmpobj->dib.dsBm.bmBits = NULL;
bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size );
if (!bmpobj->dib.dsBm.bmBits)
{
HeapFree( GetProcessHeap(), 0, bmpobj );
SetLastError( ERROR_NOT_ENOUGH_MEMORY );
return 0;
}
if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs )))
{
HeapFree( GetProcessHeap(), 0, bmpobj->dib.dsBm.bmBits );
HeapFree( GetProcessHeap(), 0, bmpobj );
return 0;
}

7
dlls/gdi32/dibdrv/dc.c
View File

@ -168,13 +168,6 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp)
BITMAPINFO info;
get_ddb_bitmapinfo( bmp, &info );
if (!bmp->dib.dsBm.bmBits)
{
int width_bytes = get_dib_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel );
bmp->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
bmp->dib.dsBm.bmHeight * width_bytes );
if (!bmp->dib.dsBm.bmBits) return FALSE;
}
init_dib_info_from_bitmapinfo( dib, &info, bmp->dib.dsBm.bmBits );
}
else init_dib_info( dib, &bmp->dib.dsBmih, bmp->dib.dsBm.bmWidthBytes,