[Bf-blender-cvs] [fcbd81fb0f8] master: Win32: WM_SETTINGCHANGE lParam Check for NULL

Harley Acheson noreply at git.blender.org
Fri May 6 02:49:51 CEST 2022


Commit: fcbd81fb0f82080186220b554d12331b675f1e5e
Author: Harley Acheson
Date:   Thu May 5 17:48:55 2022 -0700
Branches: master
https://developer.blender.org/rBfcbd81fb0f82080186220b554d12331b675f1e5e

Win32: WM_SETTINGCHANGE lParam Check for NULL

Check that lParam is non-NULL in WM_SETTINGCHANGE message handler.

See D14867 for details.

Differential Revision: https://developer.blender.org/D14867

Reviewed by Jesse Yurkovich

===================================================================

M	intern/ghost/intern/GHOST_SystemWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index ff02bc5781e..ca4bfa634c1 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1987,7 +1987,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
           }
           break;
         case WM_SETTINGCHANGE:
-          if (wcscmp(LPCWSTR(lParam), L"ImmersiveColorSet") == 0) {
+          /* Microsoft: "Note that some applications send this message with lParam set to NULL" */
+          if ((lParam != NULL) && (wcscmp(LPCWSTR(lParam), L"ImmersiveColorSet") == 0)) {
             window->ThemeRefresh();
           }
           break;



More information about the Bf-blender-cvs mailing list