Add patch for GetMenuItemInfo.

This commit is contained in:
Michael Müller
2014-09-07 20:26:44 +02:00
parent aaf6e38a98
commit c83e83b911
4 changed files with 56 additions and 1 deletions

View File

@@ -0,0 +1,31 @@
From c91c8456d92e0761f0b6df345c4547b54db63d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 7 Sep 2014 20:14:36 +0200
Subject: user32: Also set cch member in GetMenuItemInfo when passing a null
pointer.
---
dlls/user32/menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 93bee49..9e05dd4 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -4583,12 +4583,12 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos,
if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) {
if( !menu->text ) {
if(lpmii->dwTypeData && lpmii->cch) {
- lpmii->cch = 0;
if( unicode)
*((WCHAR *)lpmii->dwTypeData) = 0;
else
*((CHAR *)lpmii->dwTypeData) = 0;
}
+ lpmii->cch = 0;
} else {
int len;
if (unicode)
--
1.9.1

View File

@@ -0,0 +1,4 @@
Author: Michael Müller
Subject: Also set cch member in GetMenuItemInfo when passing a null pointer.
Revision: 1
Fixes: [34642] Fix unitialized cch value when calling GetMenuItemInfo with a null pointer