From 9e1d9ef972f65e292e7b00e1da9293271bc60486 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <wolfram@the-dreams.de>
Date: Wed, 8 Sep 2010 16:23:47 +0200
Subject: [PATCH] hhctrl: Add check for no filename.

---
 dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index 9ab66de4344..2101e0560d7 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine)
 
             ptr += strlen("mapid")+1;
             space = strchr(ptr, ' ');
+            /* command line ends without number */
+            if (!space)
+                return 0;
             memcpy(idtxt, ptr, space-ptr);
             idtxt[space-ptr] = '\0';
             mapid = atoi(idtxt);
@@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine)
         len = endq - szCmdLine;
     else
         len = strlen(szCmdLine);
+
+    /* no filename given */
+    if (!len)
+        return 0;
+
     buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1;
     filename = heap_alloc(buflen * sizeof(WCHAR));
     MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);