Rein Klazes : user32: Prevent a crash in GetMenuStringA caused by
calling strlenW on
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jan 9 13:52:41 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 079912c679af61813d761f0e43a326acbed229ff
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=079912c679af61813d761f0e43a326acbed229ff
Author: Rein Klazes <wijn at wanadoo.nl>
Date: Mon Jan 9 17:13:44 2006 +0100
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(+), 0 deletions(-)
diff --git a/dlls/user/menu.c b/dlls/user/menu.c
index 0152ede..e04291d 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 b4e9830..34f600c 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 );
}
More information about the wine-cvs
mailing list