vbscript: Handle null arguments in DateSerial().

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

vbscript: Handle null arguments in DateSerial().
f6d184fe · Nikolay Sivov · Alexandre Julliard · da966b4d · f6d184fe · f6d184fe
Commit f6d184fe authored May 19, 2022 by Nikolay Sivov Committed by Alexandre Julliard May 19, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

global.c dlls/vbscript/global.c +3 -0

api.vbs dlls/vbscript/tests/api.vbs +11 -0

No files found.
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -2095,6 +2095,9 @@ static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args

    assert(args_cnt == 3);

+    if (V_VT(args) == VT_NULL || V_VT(args + 1) == VT_NULL || V_VT(args + 2) == VT_NULL)
+        return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE);
+
    hres = to_int(args, &year);
    if (SUCCEEDED(hres))
        hres = to_int(args + 1, &month);

--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -1972,12 +1972,23 @@ end sub

 sub testDateSerialError()
    on error resume next
+    dim x
    call Err.clear()
    call DateSerial(10000, 1, 1)
    call ok(Err.number = 5, "Err.number = " & Err.number)
    call Err.clear()
    call DateSerial(-10000, 1, 1)
    call ok(Err.number = 5, "Err.number = " & Err.number)
+    call Err.clear()
+    x = DateSerial(null, 1, 1)
+    call ok(Err.number = 94, "Err.number = " & Err.number)
+    call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x))
+    call Err.clear()
+    call DateSerial(2000, null, 1)
+    call ok(Err.number = 94, "Err.number = " & Err.number)
+    call Err.clear()
+    call DateSerial(2000, 1, null)
+    call ok(Err.number = 94, "Err.number = " & Err.number)
 end sub

 call testDateSerial(100, 2, 1, 100, 2, 1)