From 182d125bc0052029ee2eff11e4932bdfd4af0187 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sun, 11 Jun 2017 10:39:55 +0000 Subject: [PATCH 1/1] [SHELL32] Do not fail CFSFolder::GetDisplayNameOf with a NULL pidl, preventing another crash in shell32:CFSFolder svn path=/trunk/; revision=74997 --- reactos/dll/win32/shell32/folders/CFSFolder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/shell32/folders/CFSFolder.cpp b/reactos/dll/win32/shell32/folders/CFSFolder.cpp index 10d417732c2..00601210ab0 100644 --- a/reactos/dll/win32/shell32/folders/CFSFolder.cpp +++ b/reactos/dll/win32/shell32/folders/CFSFolder.cpp @@ -634,7 +634,7 @@ void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags) HRESULT WINAPI CFSFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) { - if (!pidl || !strRet) + if (!strRet) return E_INVALIDARG; /* 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); } - 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 ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) && -- 2.17.1