Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 03:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Do not fail CFSFolder::GetDisplayNameOf with a NULL pidl, preventing another crash in shell32:CFSFolder

Browse source 
svn path=/trunk/; revision=74997
This commit is contained in:
Mark Jansen 2017-06-11 10:39:55 +00:00
parent 7583b2b298
commit 182d125bc0
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/shell32/folders/CFSFolder.cpp
View file

@ -634,7 +634,7 @@ void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags)
HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl,
DWORD dwFlags, LPSTRRET strRet) DWORD dwFlags, LPSTRRET strRet)
{ {
if (!pidl || !strRet) if (!strRet)
return E_INVALIDARG; return E_INVALIDARG;
/* If it is a complex pidl, let the child handle it */ /* If it is a complex pidl, let the child handle it */
@ -642,7 +642,7 @@ HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl,
{ {
return SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, strRet); return SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, strRet);
} }
else if (!pidl->mkid.cb) /* empty pidl */ else if (pidl && !pidl->mkid.cb) /* empty pidl */
{ {
/* If it is an empty pidl return only the path of the folder */ /* If it is an empty pidl return only the path of the folder */
if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) && if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) &&