[NTUSER] MENU_HideSubPopups: Check ValidateHwndNoErr return value

Check if the return value is not NULL before calling co_UserDestroyWindow. CORE-19367
TAN-Gaming · Dec 9, 2023 · 0d1b3f3 · 0d1b3f3
1 parent e4d03f4
commit 0d1b3f3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c
@@ -3282,11 +3282,13 @@ static void FASTCALL MENU_HideSubPopups(PWND pWndOwner, PMENU Menu,
       {
           PWND pWnd;
           if (!VerifyMenu(Item->spSubMenu)) return;
-          pWnd = ValidateHwndNoErr(Item->spSubMenu->hWnd);
           MENU_HideSubPopups(pWndOwner, Item->spSubMenu, FALSE, wFlags);
           MENU_SelectItem(pWndOwner, Item->spSubMenu, NO_SELECTED_ITEM, SendMenuSelect, NULL);
           TRACE("M_HSP top p hm %p  pWndOwner IDMenu %p\n",top_popup_hmenu,pWndOwner->IDMenu);
-          co_UserDestroyWindow(pWnd);
+
+          pWnd = ValidateHwndNoErr(Item->spSubMenu->hWnd);
+          if (pWnd)
+             co_UserDestroyWindow(pWnd);
 
           /* Native returns handle to destroyed window */
           if (!(wFlags & TPM_NONOTIFY))