Alexandre Julliard : explorer: Avoid crash on empty Start Menu folders.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1b025eb0b5543f058025105a623a91659cdbe99e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b025eb0b5543f058025105a62...

Author: Alexandre Julliard 
Date:   Fri Jun 10 13:47:02 2016 +0900

explorer: Avoid crash on empty Start Menu folders.

Signed-off-by: Alexandre Julliard

---

programs/explorer/startmenu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c
index 15bb7b5..0d79aca 100644
--- a/programs/explorer/startmenu.c
+++ b/programs/explorer/startmenu.c
@@ -464,8 +464,8 @@ void do_startmenu(HWND hwnd)
     if (!public_startmenu.folder)
         pidl_to_shellfolder(public_startmenu.pidl, NULL, &public_startmenu.folder);

-    if (!shell_folder_is_empty(user_startmenu.folder) ||
-        !shell_folder_is_empty(public_startmenu.folder))
+    if ((user_startmenu.folder && !shell_folder_is_empty(user_startmenu.folder)) ||
+        (public_startmenu.folder && !shell_folder_is_empty(public_startmenu.folder)))
     {
         fill_menu(&user_startmenu);