reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 21:20:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user32: Prevent a crash in GetMenuStringA caused by calling strlenW on

Browse Source 
a NULL pointer, with a test.
This commit is contained in:
Rein Klazes 2006-01-09 17:13:44 +01:00 committed by Alexandre Julliard
parent 194eeaab7d
commit 079912c679
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/user/menu.c
View File

@ -3295,6 +3295,7 @@ INT WINAPI GetMenuStringA(
SetLastError( ERROR_MENU_ITEM_NOT_FOUND);
return 0;
}
if (!item->text) return 0;
if (!str || !nMaxSiz) return strlenW(item->text);
if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL ))
str[nMaxSiz-1] = 0;

13
dlls/user/tests/menu.c
View File

@ -348,6 +348,19 @@ static void test_menu_add_string( void )
ok (GetMenuString( hmenu, 0, strback, 99, MF_BYPOSITION), "GetMenuString on ownerdraw entry failed\n");
ok (!strcmp( strback, "string2" ), "Menu text from Ansi version incorrect\n");
/* crashes with wine 0.9.5 */
memset(&info, 0x00, sizeof(info));
info.cbSize= sizeof(MENUITEMINFO);
info.fMask= MIIM_FTYPE | MIIM_STRING; /* Set OwnerDraw + typeData */
info.fType= MFT_OWNERDRAW;
rc = InsertMenuItem( hmenu, 0, TRUE, &info );
ok (rc, "InsertMenuItem failed\n");
ok (!GetMenuString( hmenu, 0, NULL, 0, MF_BYPOSITION),
"GetMenuString on ownerdraw entry succeeded.\n");
ok (!GetMenuStringW( hmenu, 0, NULL, 0, MF_BYPOSITION),
"GetMenuStringW on ownerdraw entry succeeded.\n");
DestroyMenu( hmenu );
}