jscript: Properly support missing array elements in Array.pop.

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

jscript: Properly support missing array elements in Array.pop.
89da4559 · Jacek Caban · Alexandre Julliard · 5f9f9a45 · 89da4559 · 89da4559
Commit 89da4559 authored Mar 01, 2018 by Jacek Caban Committed by Alexandre Julliard Mar 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

array.c dlls/jscript/array.c +3 -2

api.js dlls/jscript/tests/api.js +2 -0

No files found.
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -387,9 +387,10 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned
    hres = jsdisp_get_idx(jsthis, length, &val);
    if(SUCCEEDED(hres))
        hres = jsdisp_delete_idx(jsthis, length);
-    else if(hres == DISP_E_UNKNOWNNAME)
+    else if(hres == DISP_E_UNKNOWNNAME) {
        val = jsval_undefined();
-    else
+        hres = S_OK;
+    }else
        return hres;

    if(SUCCEEDED(hres))

--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -909,6 +909,8 @@ arr = [,,,,,];
 tmp = arr.pop();
 ok(arr.length === 5, "arr.length = " + arr.length);
 ok(tmp === undefined, "tmp = " + tmp);
+tmp = [1,2,,,].pop();
+ok(tmp === undefined, "tmp = " + tmp);

 function PseudoArray() {
    this[0] = 0;