vbscript: Don't allow changing script state when script site is not set.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

vbscript: Don't allow changing script state when script site is not set.
706898dc · Jacek Caban · Alexandre Julliard · e343fcaf · 706898dc · 706898dc
Commit 706898dc authored Nov 05, 2019 by Jacek Caban Committed by Alexandre Julliard Nov 05, 2019
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

vbscript.c dlls/vbscript/tests/vbscript.c +5 -0

vbscript.c dlls/vbscript/vbscript.c +1 -1

No files found.
--- a/dlls/vbscript/tests/vbscript.c
+++ b/dlls/vbscript/tests/vbscript.c
@@ -713,6 +713,11 @@ static void test_vbscript_uninitializing(void)

    test_no_script_dispatch(script);

+    hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED);
+    ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres);
+    hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED);
+    ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_INITIALIZED) failed: %08x\n", hres);
+
    SET_EXPECT(GetLCID);
    SET_EXPECT(OnStateChange_INITIALIZED);
    hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite);

--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -457,7 +457,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE 
        return S_OK;
    }

-    if(!This->is_initialized)
+    if(!This->is_initialized || !This->ctx->site)
        return E_UNEXPECTED;

    switch(ss) {