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

Prevent CreateDIBSection from seg faulting when one dimension of 

section is 0.
This commit is contained in:
Eric Pouech 1998-11-08 16:27:02 +00:00 committed by Alexandre Julliard
parent dc163422a1
commit cd67edd365
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
objects/dib.c
View File

@ -979,12 +979,17 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
if (dib) if (dib)
{ {
res = CreateDIBitmap32(hdc, bi, 0, NULL, bmi, usage); res = CreateDIBitmap32(hdc, bi, 0, NULL, bmi, usage);
bmp = (BITMAPOBJ *) GDI_GetObjPtr(res, BITMAP_MAGIC); if (res)
if (bmp) bmp->dib = dib; {
bmp = (BITMAPOBJ *) GDI_GetObjPtr(res, BITMAP_MAGIC);
/* HACK for now */ if (bmp)
if(!bmp->DDBitmap) {
X11DRV_CreateBitmap(res); bmp->dib = dib;
/* HACK for now */
if(!bmp->DDBitmap)
X11DRV_CreateBitmap(res);
}
}
} }
/* Create XImage */ /* Create XImage */
@ -994,6 +999,8 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
/* Clean up in case of errors */ /* Clean up in case of errors */
if (!res || !bmp || !dib || !bm.bmBits || (bm.bmBitsPixel <= 8 && !colorMap)) if (!res || !bmp || !dib || !bm.bmBits || (bm.bmBitsPixel <= 8 && !colorMap))
{ {
TRACE(bitmap, "got an error res=%lu, bmp=%p, dib=%p, bm.bmBits=%p\n",
res, bmp, dib, bm.bmBits);
if (bm.bmBits) if (bm.bmBits)
{ {
if (section) if (section)
@ -1002,19 +1009,21 @@ HBITMAP32 WINAPI CreateDIBSection32 (HDC32 hdc, BITMAPINFO *bmi, UINT32 usage,
VirtualFree(bm.bmBits, MEM_RELEASE, 0L), bm.bmBits = NULL; VirtualFree(bm.bmBits, MEM_RELEASE, 0L), bm.bmBits = NULL;
} }
if (dib->image) XDestroyImage(dib->image), dib->image = NULL; if (dib && dib->image) { XDestroyImage(dib->image); dib->image = NULL; }
if (colorMap) HeapFree(GetProcessHeap(), 0, colorMap), colorMap = NULL; if (colorMap) { HeapFree(GetProcessHeap(), 0, colorMap); colorMap = NULL; }
if (dib) HeapFree(GetProcessHeap(), 0, dib), dib = NULL; if (dib) { HeapFree(GetProcessHeap(), 0, dib); dib = NULL; }
if (res) DeleteObject32(res), res = 0; if (res) { DeleteObject32(res); res = 0; }
} }
/* Install fault handler, if possible */ /* Install fault handler, if possible */
if (bm.bmBits) if (bm.bmBits)
{
if (VIRTUAL_SetFaultHandler(bm.bmBits, DIB_FaultHandler, (LPVOID)res)) if (VIRTUAL_SetFaultHandler(bm.bmBits, DIB_FaultHandler, (LPVOID)res))
{ {
DIB_DoProtectDIBSection( bmp, PAGE_READONLY ); DIB_DoProtectDIBSection( bmp, PAGE_READONLY );
dib->status = DIB_InSync; if (dib) dib->status = DIB_InSync;
} }
}
/* Return BITMAP handle and storage location */ /* Return BITMAP handle and storage location */
if (res) GDI_HEAP_UNLOCK(res); if (res) GDI_HEAP_UNLOCK(res);