From: James Tabor <james.tabor@reactos.org>
Date: Mon, 14 Apr 2014 06:05:34 +0000 (+0000)
Subject: [User32]
X-Git-Tag: backups/0.3.17@66124~1734
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=52fbc79cd63ce5cbefb19515b9c0c3531706c63a

[User32]
- Fixed get menu info, check parameters first than the handle. See CORE-8064.

svn path=/trunk/; revision=62747
---

diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index c051f69dd44..d3eeae860bc 100644
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -4269,15 +4269,15 @@ GetMenuInfo(HMENU hmenu,
   BOOL res = FALSE;
   PVOID pMenu;
 
-  if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU)))
-     return FALSE;
-
   if (!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO)))
   {
      SetLastError(ERROR_INVALID_PARAMETER);
      return FALSE;
   }
 
+  if (!(pMenu = ValidateHandle(hmenu, TYPE_MENU)))
+     return FALSE;
+
   RtlZeroMemory(&mi, sizeof(MENUINFO));
   mi.cbSize = sizeof(MENUINFO);
   mi.fMask = lpcmi->fMask;