Jacek Caban : ieframe: Don' t crash if output parameter is NULL in WebBrowser:: get_RegisterAsDropTarget.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 379b9f67758b9236317b902357aa474b30ba927e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=379b9f67758b9236317b902357...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Tue Oct  7 10:22:51 2014 +0200

ieframe: Don't crash if output parameter is NULL in WebBrowser::get_RegisterAsDropTarget.

---

 dlls/ieframe/tests/webbrowser.c | 4 ++++
 dlls/ieframe/webbrowser.c       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c
index 5973900..fa37169 100644
--- a/dlls/ieframe/tests/webbrowser.c
+++ b/dlls/ieframe/tests/webbrowser.c
@@ -2321,6 +2321,10 @@ static void test_ie_funcs(IWebBrowser2 *wb)
         ok(sName!=NULL, "get_Name return a NULL string.\n");
     SysFreeString(sName);
 
+    /* RegisterAsDropTarget */
+    hres = IWebBrowser2_get_RegisterAsDropTarget(wb, NULL);
+    ok(hres == E_INVALIDARG, "get_RegisterAsDropTarget returned: %08x\n", hres);
+
     /* Quit */
 
     hres = IWebBrowser2_Quit(wb);
diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c
index a3233e1..1f58bbb 100644
--- a/dlls/ieframe/webbrowser.c
+++ b/dlls/ieframe/webbrowser.c
@@ -943,7 +943,12 @@ static HRESULT WINAPI WebBrowser_get_RegisterAsDropTarget(IWebBrowser2 *iface,
         VARIANT_BOOL *pbRegister)
 {
     WebBrowser *This = impl_from_IWebBrowser2(iface);
+
     FIXME("(%p)->(%p)\n", This, pbRegister);
+
+    if(!pbRegister)
+        return E_INVALIDARG;
+
     *pbRegister=0;
     return S_OK;
 }