jscript: Properly support missing array elements in stringify_array.

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

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

Showing with 11 additions and 8 deletions

json.c dlls/jscript/json.c +11 -8

No files found.
--- a/dlls/jscript/json.c
+++ b/dlls/jscript/json.c
@@ -545,15 +545,18 @@ static HRESULT stringify_array(stringify_ctx_t *ctx, jsdisp_t *obj)
        }

        hres = jsdisp_get_idx(obj, i, &val);
-        if(FAILED(hres))
-            return hres;
-
-        hres = stringify(ctx, val);
-        if(FAILED(hres))
+        if(SUCCEEDED(hres)) {
+            hres = stringify(ctx, val);
+            if(FAILED(hres))
+                return hres;
+            if(hres == S_FALSE && !append_string(ctx, nullW))
+                return E_OUTOFMEMORY;
+        }else if(hres == DISP_E_UNKNOWNNAME) {
+            if(!append_string(ctx, nullW))
+                return E_OUTOFMEMORY;
+        }else {
            return hres;
-
-        if(hres == S_FALSE && !append_string(ctx, nullW))
-            return E_OUTOFMEMORY;
+        }
    }

    if((length && *ctx->gap && !append_char(ctx, '\n')) || !append_char(ctx, ']'))