From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 3 Mar 2018 07:19:13 +0000 (+0100)
Subject: [WIN32K:NTUSER] Handle IntCloneMenu failure in MENU_GetSystemMenu. CORE-12180
X-Git-Tag: 0.4.9-RC~695
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=89217e3df563a4e843b18a4c6deca83994834e8e

[WIN32K:NTUSER] Handle IntCloneMenu failure in MENU_GetSystemMenu. CORE-12180
---

diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c
index 888b4ea696e..dc6656ffb35 100644
--- a/win32ss/user/ntuser/menu.c
+++ b/win32ss/user/ntuser/menu.c
@@ -5120,6 +5120,12 @@ PMENU FASTCALL MENU_GetSystemMenu(PWND Window, PMENU Popup)
       IntMenuItemInfo(Menu, SC_MINIMIZE, FALSE, &ItemInfoSet, TRUE, NULL);
 
       NewMenu = IntCloneMenu(Menu);
+      if (NewMenu == NULL)
+      {
+         IntDestroyMenuObject(Menu, FALSE);
+         IntDestroyMenuObject(SysMenu, FALSE);
+         return NULL;
+      }
 
       IntReleaseMenuObject(NewMenu);
       UserSetMenuDefaultItem(NewMenu, SC_CLOSE, FALSE);