wine/dlls/shdocvw webbrowser.c

[Alexandre Julliard]

ChangeSet ID:	21458
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/28 05:01:25

Modified files:
	dlls/shdocvw   : webbrowser.c 

Log message:
	Jacek Caban <jacek at codeweavers.com>
	Don't crash when parameters of Navigate2 are NULL.

Patch: http://cvs.winehq.org/patch.py?id=21458

Old revision  New revision  Changes     Path
 1.25          1.26          +7 -3       wine/dlls/shdocvw/webbrowser.c

Index: wine/dlls/shdocvw/webbrowser.c
diff -u -p wine/dlls/shdocvw/webbrowser.c:1.25 wine/dlls/shdocvw/webbrowser.c:1.26
--- wine/dlls/shdocvw/webbrowser.c:1.25	28 Nov 2005 11: 1:25 -0000
+++ wine/dlls/shdocvw/webbrowser.c	28 Nov 2005 11: 1:25 -0000
@@ -504,12 +504,16 @@ static HRESULT WINAPI WebBrowser_Navigat
     if(!This->client)
         return E_FAIL;
 
-    if(V_VT(Flags) != VT_EMPTY || V_VT(TargetFrameName) != VT_EMPTY
-       || V_VT(PostData) != VT_EMPTY || V_VT(Headers) != VT_EMPTY)
+    if((Flags && V_VT(Flags) != VT_EMPTY) 
+       || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY)
+       || (PostData && V_VT(PostData) != VT_EMPTY) 
+       || (Headers && V_VT(Headers) != VT_EMPTY))
         FIXME("Unsupported arguments\n");
 
+    if(!URL)
+        return S_OK;
     if(V_VT(URL) != VT_BSTR)
-        FIXME("V_VT(URL) != VT_BSTR\n");
+        return E_INVALIDARG;
 
     /*
      * FIXME: