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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 425c30f5445d8014cb49408b7efee571ccb637b0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=425c30f5445d8014cb49408b7e...

Author: Erich Hoover <ehoover(a)mines.edu>
Date:   Fri Jan 29 08:00:30 2010 -0700

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

---

 dlls/hhctrl.ocx/help.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index e7b7a64..e8121e7 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);