Mercurial > njs

changeset 1808:3e86977c253d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed Array.prototype.concat() with exotic argument object. The issue was introduced in 2c1382bab643.
author Dmitry Volyntsev <xeioex@nginx.com>
date Tue, 18 Jan 2022 15:35:00 +0000
parents 7467158d9f37
children 1634e2b7a9e7
files src/njs_array.c src/test/njs_unit_test.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/njs_array.c	Fri Jan 14 14:40:27 2022 +0000
+++ b/src/njs_array.c	Tue Jan 18 15:35:00 2022 +0000
@@ -1743,7 +1743,7 @@
                 return NJS_ERROR;
             }
 
-            if (njs_is_fast_array(e)) {
+            if (njs_is_fast_array(e) || njs_fast_object(len)) {
                 for (k = 0; k < len; k++, length++) {
                     ret = njs_value_property_i64(vm, e, k, &retval);
                     if (njs_slow_path(ret != NJS_OK)) {
--- a/src/test/njs_unit_test.c	Fri Jan 14 14:40:27 2022 +0000
+++ b/src/test/njs_unit_test.c	Tue Jan 18 15:35:00 2022 +0000
@@ -12857,6 +12857,13 @@
               "a.concat(b)"),
       njs_str("1,2,3,4,5") },
 
+    { njs_str("Boolean.prototype.length = 2;"
+              "Boolean.prototype[0] = 'a';"
+              "Boolean.prototype[1] = 'b';"
+              "Boolean.prototype[Symbol.isConcatSpreadable] = true;"
+              "[].concat(new Boolean(true))"),
+      njs_str("a,b") },
+
     { njs_str("var o = {}, n = 5381 /* NJS_DJB_HASH_INIT */;"
               "while(n--) o[Symbol()] = 'test'; o[''];"),
       njs_str("undefined") },