hhctrl.ocx: Check the filename param before dereferencing it.

9f42e8eb · James Hawkins · Alexandre Julliard · 70cd6bfb · 9f42e8eb
Commit 9f42e8eb authored May 20, 2008 by James Hawkins Committed by Alexandre Julliard May 20, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

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

        FIXME("Not all HH cases handled correctly\n");

+        if (!filename)
+            return NULL;
+
        index = strstrW(filename, delimW);
        if (index)
        {
@@ -141,6 +144,9 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
        HHInfo *info;
        LPWSTR url;

+        if (!filename)
+            return NULL;
+
        info = CreateHelpViewer(filename);
        if(!info)
            return NULL;