shell32: Fix an uninitialized memory access in SHGetFileInfoW.

If we are passed SHGFI_PIDL, szFullPath is not initialized. If we're passed the flags PIDL, USEFILEATTRIBUTES, and an icon flag, we will try to use the uninitialized filename to get the icon. Since the test claims that the function should return an icon in this case, and we cannot always convert a pidl to a path, we should just use the pidl.

shell32: Fix an uninitialized memory access in SHGetFileInfoW.
a8c2d4b5 · Vincent Povirk · Alexandre Julliard · 3ac34f74 · a8c2d4b5
Commit a8c2d4b5 authored Dec 13, 2009 by Vincent Povirk Committed by Alexandre Julliard Dec 14, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

shell32_main.c dlls/shell32/shell32_main.c +1 -1

No files found.
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -565,7 +565,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
    /* get icon index (or load icon)*/
    if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX)))
    {
-        if (flags & SHGFI_USEFILEATTRIBUTES)
+        if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL))
        {
            WCHAR sTemp [MAX_PATH];
            WCHAR * szExt;