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

Fix Excel 2010 crashing in get_display_name() when clicking the ribbon bar file tab. The check was removed in 984f608c. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Check This->sPathTarget before calling get_display_name().
681d2dfd · Zhiyi Zhang · Alexandre Julliard · d5c99877 · 681d2dfd
Commit 681d2dfd authored Nov 11, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Nov 11, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

shfldr_fs.c dlls/shell32/shfldr_fs.c +3 -2

No files found.
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -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;