From 2c4beeca8e4ae94a9cea8bd428ff66373a83f9e2 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 25 Jan 2022 21:08:14 +0900 Subject: [PATCH] [SHELL32] CCopyToMenu/CMoveToMenu: Check if this_ is NULL --- dll/win32/shell32/CCopyToMenu.cpp | 3 +++ dll/win32/shell32/CMoveToMenu.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index 034acb5d844..e72b217945b 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -101,6 +101,9 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) } case BFFM_SELCHANGED: { + if (!this_) + break; + WCHAR szPath[MAX_PATH]; LPCITEMIDLIST pidl = reinterpret_cast(lParam); diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index ec8714ebd9b..c0e1c83a54d 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -100,6 +100,9 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) } case BFFM_SELCHANGED: { + if (!this_) + break; + WCHAR szPath[MAX_PATH]; LPCITEMIDLIST pidl = reinterpret_cast(lParam);