From 079912c679af61813d761f0e43a326acbed229ff Mon Sep 17 00:00:00 2001 From: Rein Klazes Date: Mon, 9 Jan 2006 17:13:44 +0100 Subject: [PATCH] user32: Prevent a crash in GetMenuStringA caused by calling strlenW on a NULL pointer, with a test. --- dlls/user/menu.c | 1 + dlls/user/tests/menu.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 0152ede9216..e04291d2b78 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -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; diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index b4e9830a548..34f600c4e7e 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -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 ); } -- 2.11.4.GIT