commit ae48e099dab2ec266598d2cb6f2704135e689e5d
author Rich Ercolani <Rincebrain+wine@gmail.com> Sat Jan 10 04:48:54 2009 -0500
committer Alexandre Julliard <julliard@winehq.org> Sat Jan 10 18:04:28 2009 +0100
tree 4157d1abd858ff4f28aa14e13f0341872a8dd7ca
parent 5e79b0608d93546cac057ac6fcfe1e0f6c028849

winefile: Fix NULL pointer deref in read_tree.

programs/winefile/winefile.c

diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c
index b3e5471..2caff8e 100644
--- a/programs/winefile/winefile.c
+++ b/programs/winefile/winefile.c
@@ -3781,8 +3781,15 @@
 	scan_entry(child, &child->root.entry, 0, child->hwnd);
 
 #ifdef _SHELL_FOLDERS
+
 	if (child->root.entry.etype == ET_SHELL)
-		entry = read_tree(&child->root, NULL, get_path_pidl(path,child->hwnd), drv, child->sortOrder, child->hwnd);
+	{
+		LPITEMIDLIST local_pidl = get_path_pidl(path,child->hwnd);
+		if (local_pidl)
+			entry = read_tree(&child->root, NULL, local_pidl , drv, child->sortOrder, child->hwnd);
+		else
+			entry = NULL;
+	}
 	else
 #endif
 		entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd);