commit 425c30f5445d8014cb49408b7efee571ccb637b0
author Erich Hoover <ehoover@mines.edu> Fri Jan 29 08:00:30 2010 -0700
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 29 17:26:46 2010 +0100
tree d7cc6bd95531a959f19a6e7c8157899453b8bf68
parent 207ce6fcb28accbc6dbfaf7bc0e3373606ac09cb

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

dlls/hhctrl.ocx/help.c

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 @@
             }
             citer = citer->parent;
         }
-        chmfile = citer->merge.chm_file;
         break;
     case TAB_INDEX:
         iiter = (IndexItem *) user_data;
@@ -458,6 +457,12 @@
         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);