Module: wine Branch: master Commit: 32520439e18e5cfb666dd8d28324a1f16249d3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32520439e18e5cfb666dd8d283... Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Wed Jul 19 17:23:07 2017 +0200 shell32: Prevent a possible null pointer dereference in SHGetFileInfoW. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 34b906c..0ed6790 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -431,7 +431,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, - psfi, psfi->dwAttributes, sizeofpsfi, flags); + psfi, psfi ? psfi->dwAttributes : 0, sizeofpsfi, flags); if (!path) return FALSE;