hhctrl: Fix NULL pointer dereference in some failure cases.

efa04011 · Tijl Coosemans · Alexandre Julliard · 9cce7898 · efa04011
Commit efa04011 authored Apr 28, 2008 by Tijl Coosemans Committed by Alexandre Julliard Apr 29, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

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

No files found.
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -123,14 +123,17 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
        }

        info = CreateHelpViewer(filename);
+        if(!info)
+            return NULL;
+
+        if(!index)
+            index = info->WinType.pszFile;

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