comctl32: Check reference data pointer before using it.

Fix the crash when opening notepad++ v8.4.4 preference dialog before e52e42b8.

comctl32: Check reference data pointer before using it.
9b9fef2e · Zhiyi Zhang · Alexandre Julliard · f7443102 · 9b9fef2e · 9b9fef2e
Commit 9b9fef2e authored Aug 16, 2022 by Zhiyi Zhang Committed by Alexandre Julliard Aug 16, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

commctrl.c dlls/comctl32/commctrl.c +2 -1

subclass.c dlls/comctl32/tests/subclass.c +0 -4

No files found.
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -1179,7 +1179,8 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
   while (proc) {
      if ((proc->id == uID) &&
         (proc->subproc == pfnSubclass)) {
-         *pdwRef = proc->ref;
+         if (pdwRef)
+            *pdwRef = proc->ref;
         return TRUE;
      }
      proc = proc->next;

--- a/dlls/comctl32/tests/subclass.c
+++ b/dlls/comctl32/tests/subclass.c
@@ -371,12 +371,8 @@ static void test_GetWindowSubclass(void)
    todo_wine
    ok(data == 0, "Got unexpected data %#Ix.\n", data);

-    /* Crash on Wine */
-    if (strcmp(winetest_platform, "wine"))
-    {
    ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL);
    ok(ret, "GetWindowSubclass failed.\n");
-    }

    data = 0xdeadbeef;
    ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data);