reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-03-02 09:47:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comctl32/propsheet: Enforce minimal PROPSHEETPAGE structure size when creating a page.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-03-01 22:47:20 +03:00 committed by Alexandre Julliard
parent b5b26c204f
commit a3aa217f03
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/comctl32/propsheet.c
View File

@ -2957,8 +2957,12 @@ static LPWSTR load_string( HINSTANCE instance, LPCWSTR str )
HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
LPCPROPSHEETPAGEA lpPropSheetPage) LPCPROPSHEETPAGEA lpPropSheetPage)
{ {
PROPSHEETPAGEW* ppsp = Alloc(sizeof(PROPSHEETPAGEW)); PROPSHEETPAGEW *ppsp;
if (lpPropSheetPage->dwSize < PROPSHEETPAGEA_V1_SIZE)
return NULL;
ppsp = Alloc(sizeof(PROPSHEETPAGEW));
memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA))); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEA)));
ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE; ppsp->dwFlags &= ~ PSP_INTERNAL_UNICODE;
@ -3023,8 +3027,12 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
*/ */
HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage) HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
{ {
PROPSHEETPAGEW* ppsp = Alloc(sizeof(PROPSHEETPAGEW)); PROPSHEETPAGEW *ppsp;
if (lpPropSheetPage->dwSize < PROPSHEETPAGEW_V1_SIZE)
return NULL;
ppsp = Alloc(sizeof(PROPSHEETPAGEW));
memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEW))); memcpy(ppsp,lpPropSheetPage,min(lpPropSheetPage->dwSize,sizeof(PROPSHEETPAGEW)));
ppsp->dwFlags |= PSP_INTERNAL_UNICODE; ppsp->dwFlags |= PSP_INTERNAL_UNICODE;

2
dlls/comctl32/tests/propsheet.c
View File

@ -1076,7 +1076,6 @@ static void test_CreatePropertySheetPage(void)
hpsp = CreatePropertySheetPageA(&page.u.pageA); hpsp = CreatePropertySheetPageA(&page.u.pageA);
if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE)
todo_wine
ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize);
else else
{ {
@ -1108,7 +1107,6 @@ static void test_CreatePropertySheetPage(void)
hpsp = CreatePropertySheetPageW(&page.u.pageW); hpsp = CreatePropertySheetPageW(&page.u.pageW);
if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE)
todo_wine
ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize);
else else
{ {