system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 08:36:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winspool: Check dmSize in IsValidDevmodeW().

Browse source
This commit is contained in:
Tingzhong Luo 2022-11-25 16:20:47 +08:00 committed by Alexandre Julliard
parent 9d6a9909c3
commit 3eb06cf431
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/winspool.drv/info.c
View file

@ -1927,12 +1927,14 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size)
#undef F_SIZE
};
int i;
const DWORD fields_off = FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dm->dmFields);
if (!dm) return FALSE;
if (size < FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dm->dmFields)) return FALSE;
if (size < fields_off) return FALSE;
if (dm->dmSize < fields_off || size < dm->dmSize + dm->dmDriverExtra) return FALSE;
for (i = 0; i < ARRAY_SIZE(map); i++)
if ((dm->dmFields & map[i].flag) && size < map[i].size)
if ((dm->dmFields & map[i].flag) && dm->dmSize < map[i].size)
return FALSE;
return TRUE;

31
dlls/winspool.drv/tests/info.c
View file

@ -3046,6 +3046,26 @@ static void test_IsValidDevmodeW(void)
{ DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 4, TRUE },
};
static const struct
{
DWORD dmSize;
DWORD dmDriverExtra;
DWORD bufSize;
BOOL ret;
} size_test[] =
{
{ FIELD_OFFSET(DEVMODEW, dmFields) + 3, 1, FIELD_OFFSET(DEVMODEW, dmFields) + 4, FALSE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 4, 1, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 4, 2, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 4, 3, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 4, 4, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 4, 5, FIELD_OFFSET(DEVMODEW, dmFields) + 8, FALSE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 12, 1, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 12, 2, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 12, 3, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 12, 4, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE },
{ FIELD_OFFSET(DEVMODEW, dmFields) + 12, 5, FIELD_OFFSET(DEVMODEW, dmFields) + 16, FALSE },
};
DEVMODEW dm;
int i;
BOOL ret;
@ -3064,6 +3084,17 @@ static void test_IsValidDevmodeW(void)
dm.dmFields = test[i].dmFields;
ret = IsValidDevmodeW(&dm, dm.dmSize);
ok(ret == test[i].ret, "%d: got %d\n", i, ret);
ret = IsValidDevmodeW(&dm, dm.dmSize + 4);
ok(ret == test[i].ret, "%d: got %d\n", i, ret);
}
dm.dmFields = 0;
for (i = 0; i < ARRAY_SIZE(size_test); i++)
{
dm.dmSize = size_test[i].dmSize;
dm.dmDriverExtra = size_test[i].dmDriverExtra;
ret = IsValidDevmodeW(&dm, size_test[i].bufSize);
ok(ret == size_test[i].ret, "%d: got %d\n", i, ret);
}
}