From: Joachim Henze <Joachim.Henze@reactos.org>
Date: Fri, 21 Sep 2018 01:04:31 +0000 (+0200)
Subject: [WIN32K:NTUSER] Fix WIN32K BSOD mentioned in CORE-15027
X-Git-Tag: 0.4.12-dev~753
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ef016bfe0a9dc3cc7924671277b44884e39d89d5

[WIN32K:NTUSER] Fix WIN32K BSOD mentioned in CORE-15027

Fixes accessing nullptr / invalid handle in Window->SystemMenu
I could trigger this occasionally when moving Opera 12.18 window
in front of Spotify 1.0.29.92 window.

Fix was:
authored by Thomas Faber (Thank you!)
tested by me
reviewed by James Tabor
---

diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c
index 1e29d1d178b..48d9dcc169e 100644
--- a/win32ss/user/ntuser/menu.c
+++ b/win32ss/user/ntuser/menu.c
@@ -5181,7 +5181,7 @@ IntGetSystemMenu(PWND Window, BOOL bRevert)
    else
    {
       Menu = Window->SystemMenu ? UserGetMenuObject(Window->SystemMenu) : NULL;
-      if ((!Window->SystemMenu || Menu->fFlags & MNF_SYSDESKMN) && Window->style & WS_SYSMENU)
+      if ((!Menu || Menu->fFlags & MNF_SYSDESKMN) && Window->style & WS_SYSMENU)
       {
          Menu = MENU_GetSystemMenu(Window, NULL);
          Window->SystemMenu = Menu ? UserHMGetHandle(Menu) : NULL;