Author: gadamopoulos
Date: Thu Nov 10 08:10:28 2016
New Revision: 73188
URL: http://svn.reactos.org/svn/reactos?rev=73188&view=rev
Log:
[SHELL32] - CMenuBand: Don't accept a NULL shell folder in SetShellFolder.
Should fix a test and possibly CORE-12300.
Modified:
trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp
Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp?rev=73188&r1=73187&r2=73188&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1]
(original)
+++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1]
Thu Nov 10 08:10:28 2016
@@ -672,6 +672,9 @@
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);