From 10d57cb8b2d15d441f24ce18f7e1ee6bdec93d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 31 Aug 2025 17:02:47 +0200 Subject: [PATCH] [NTUSER] IntLanguageToggle(): Guard against NULL pFocusQueue (#8368) Addendum to commit 25b7447818 (PR #5839) --- win32ss/user/ntuser/keyboard.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/keyboard.c b/win32ss/user/ntuser/keyboard.c index 3e187da36e4..95ef671d3fb 100644 --- a/win32ss/user/ntuser/keyboard.c +++ b/win32ss/user/ntuser/keyboard.c @@ -821,12 +821,17 @@ IntLanguageToggle( _In_ BOOL bSameLang, _In_ INT nKeyState) { - PWND pWnd = pFocusQueue->spwndFocus; - HWND hWnd; - WPARAM wParam = 0; + PWND pWnd; PTHREADINFO pti; PKL pkl; + WPARAM wParam = 0; + if (!pFocusQueue) + { + ERR("IntLanguageToggle(): NULL pFocusQueue\n"); + return; + } + pWnd = pFocusQueue->spwndFocus; if (!pWnd) pWnd = pFocusQueue->spwndActive; if (!pWnd) @@ -843,8 +848,7 @@ IntLanguageToggle( if (gSystemFS & pkl->dwFontSigs) wParam |= INPUTLANGCHANGE_SYSCHARSET; - hWnd = UserHMGetHandle(pWnd); - UserPostMessage(hWnd, WM_INPUTLANGCHANGEREQUEST, wParam, (LPARAM)pkl->hkl); + UserPostMessage(UserHMGetHandle(pWnd), WM_INPUTLANGCHANGEREQUEST, wParam, (LPARAM)pkl->hkl); } /* Check Language Toggle by [Left Alt]+Shift or Ctrl+Shift */