system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 20:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell32: Check This->sPathTarget before calling get_display_name().

Browse source 
Fix Excel 2010 crashing in get_display_name() when clicking the ribbon bar file tab.
The check was removed in 984f608.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2021-11-11 17:26:31 +08:00 committed by Alexandre Julliard
parent d5c998770e
commit 681d2dfd9d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/shell32/shfldr_fs.c
View file

@ -867,8 +867,9 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl,
if ((GET_SHGDN_FOR(dwFlags) & SHGDN_FORPARSING) &&
(GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER))
{
get_display_name( pszPath, This->sPathTarget, pidl,
IsEqualCLSID( This->pclsid, &CLSID_UnixFolder ));
if (This->sPathTarget)
get_display_name( pszPath, This->sPathTarget, pidl,
IsEqualCLSID( This->pclsid, &CLSID_UnixFolder ));
} else {
/* pidl has to contain exactly one non null SHITEMID */
hr = E_INVALIDARG;