Module: wine
Branch: master
Commit: b6240570e237fe79dedace0fcc8634e1a6b8baa5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6240570e237fe79dedace0f…
Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Date: Thu Feb 13 19:49:52 2020 +0100
vbscript: Fail if we have no context in InvokeEx.
The current code can't cope with it, so do the same thing as in GetDispID,
to prevent a possible crash.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/vbscript/vbdisp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index c14cd7b4c7..36eba21e27 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -1388,6 +1388,9 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller);
+ if (!This->ctx)
+ return E_UNEXPECTED;
+
if (id & DISPID_FUNCTION_MASK)
{
id &= ~DISPID_FUNCTION_MASK;