From 0125f9192d175f2b15beaf8601a1b5d15fc16b02 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Thu, 10 Nov 2016 08:10:28 +0000 Subject: [PATCH] [SHELL32] - CMenuBand: Don't accept a NULL shell folder in SetShellFolder. Should fix a test and possibly CORE-12300. svn path=/trunk/; revision=73188 --- reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp index 8826da91cbf..1e87eac6d0f 100644 --- a/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp +++ b/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp @@ -672,6 +672,9 @@ HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *pl HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) { + if (!psf) + return E_INVALIDARG; + if (m_SFToolbar == NULL) { m_SFToolbar = new CMenuSFToolbar(this); -- 2.17.1