hhctrl.ocx: Do not try to dereference NULL pointer if CreateHelpViewer failed.

38acaccd · Andrey Turkin · Alexandre Julliard · 41342a32 · 38acaccd
Commit 38acaccd authored May 02, 2007 by Andrey Turkin Committed by Alexandre Julliard May 03, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

hhctrl.c dlls/hhctrl.ocx/hhctrl.c +6 -3

No files found.
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -107,9 +107,12 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat

        info = CreateHelpViewer(filename);

-        res = NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile);
-        if(!res)
-            ReleaseHelpViewer(info);
+        if (info)
+        {
+            res = NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile);
+            if(!res)
+                ReleaseHelpViewer(info);
+        }

        return NULL; /* FIXME */
    }