From: Erich Hoover <ehoover@mines.edu>
Date: Fri, 29 Jan 2010 15:00:30 +0000 (-0700)
Subject: hhctrl.ocx: Fix a NULL dereference mistake in the Contents tab.
X-Git-Tag: wine-1.1.38~286
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=425c30f5445d8014cb49408b7efee571ccb637b0;p=wine%2Feterwine.git

hhctrl.ocx: Fix a NULL dereference mistake in the Contents tab.
---

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index e7b7a64272..e8121e7910 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -419,7 +419,6 @@ static LRESULT OnTopicChange(HHInfo *info, void *user_data)
             }
             citer = citer->parent;
         }
-        chmfile = citer->merge.chm_file;
         break;
     case TAB_INDEX:
         iiter = (IndexItem *) user_data;
@@ -458,6 +457,12 @@ static LRESULT OnTopicChange(HHInfo *info, void *user_data)
         return 0;
     }
 
+    if(!chmfile)
+    {
+        FIXME("No help file found for this item!\n");
+        return 0;
+    }
+
     TRACE("name %s loal %s\n", debugstr_w(name), debugstr_w(local));
 
     NavigateToChm(info, chmfile, local);