vbscript: Fix for unchecked memory access.

06dfe8fc · Thomas Faller · Alexandre Julliard · 38f69193 · 06dfe8fc
Commit 06dfe8fc authored May 23, 2015 by Thomas Faller Committed by Alexandre Julliard May 26, 2015
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1827,7 +1827,7 @@ static HRESULT Global_InStrRev(vbdisp_t *This, VARIANT *args, unsigned args_cnt,

    assert(2 <= args_cnt && args_cnt <= 4);

-    if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || V_VT(args+2) == VT_NULL)
+    if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || (args_cnt > 2 && V_VT(args+2) == VT_NULL))
        return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE);

    hres = to_string(args, &str1);