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

gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData().

This commit is contained in:
Henri Verbeet 2014-05-06 13:06:22 +02:00 committed by Alexandre Julliard
parent 89d40b3de1
commit 9016d1eda0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/gdi32/region.c
View File

@ -886,13 +886,13 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
if(!obj) return 0;
size = obj->numRects * sizeof(RECT);
if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL)
if (!rgndata || count < FIELD_OFFSET(RGNDATA, Buffer[size]))
{
GDI_ReleaseObj( hrgn );
if (rgndata) /* buffer is too small, signal it by return 0 */
return 0;
else /* user requested buffer size with rgndata NULL */
return size + sizeof(RGNDATAHEADER);
/* user requested buffer size with rgndata NULL */
return FIELD_OFFSET(RGNDATA, Buffer[size]);
}
rgndata->rdh.dwSize = sizeof(RGNDATAHEADER);
@ -907,7 +907,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
memcpy( rgndata->Buffer, obj->rects, size );
GDI_ReleaseObj( hrgn );
return size + sizeof(RGNDATAHEADER);
return FIELD_OFFSET(RGNDATA, Buffer[size]);
}