details: https://hg.nginx.org/njs/rev/ab9fc6079788
branches:
changeset: 1074:ab9fc6079788
user: Artem S. Povalyukhin <artem.povaluhin@gmail.com>
date: Fri Jul 26 07:24:36 2019 +0300
description:
Fixed Array.length setter.

This closes #26 and closes #27 issues on Github.

diffstat:

njs/njs_array.c | 21 ++++++++++++++-------
njs/test/njs_unit_test.c | 20 ++++++++++++++++++++
2 files changed, 34 insertions(+), 7 deletions(-)

diffs (80 lines):

diff -r 98c4858be02a -r ab9fc6079788 njs/njs_array.c
--- a/njs/njs_array.c Fri Jul 26 22:37:38 2019 -0400
+++ b/njs/njs_array.c Fri Jul 26 07:24:36 2019 +0300
@@ -318,10 +318,11 @@ njs_array_length(njs_vm_t *vm, njs_value
njs_value_t *val;
njs_array_t *array;
njs_object_t *proto;
+ njs_value_t val_length;

proto = njs_object(value);

- if (setval == NULL) {
+ if (nxt_fast_path(setval == NULL)) {
do {
if (nxt_fast_path(proto->type == NJS_ARRAY)) {
break;
@@ -345,13 +346,19 @@ njs_array_length(njs_vm_t *vm, njs_value
return NJS_DECLINED;
}

- if (!njs_is_number(setval)) {
- njs_range_error(vm, "Invalid array length");
- return NJS_ERROR;
+ if (nxt_slow_path(!njs_is_number(setval))) {
+ ret = njs_value_to_numeric(vm, &val_length, setval);
+ if (ret != NXT_OK) {
+ return ret;
+ }
+
+ num = njs_number(&val_length);
+
+ } else {
+ num = njs_number(setval);
}

- num = njs_number(setval);
- length = (uint32_t) num;
+ length = njs_number_to_uint32(num);

if ((double) length != num) {
njs_range_error(vm, "Invalid array length");
@@ -379,7 +386,7 @@ njs_array_length(njs_vm_t *vm, njs_value

array->length = length;

- njs_set_number(retval, length);
+ *retval = *setval;
return NJS_OK;
}

diff -r 98c4858be02a -r ab9fc6079788 njs/test/njs_unit_test.c
--- a/njs/test/njs_unit_test.c Fri Jul 26 22:37:38 2019 -0400
+++ b/njs/test/njs_unit_test.c Fri Jul 26 07:24:36 2019 +0300
@@ -3531,6 +3531,26 @@ static njs_unit_test_t njs_test[] =
{ nxt_string("[].length = -1"),
nxt_string("RangeError: Invalid array length") },

+ { nxt_string("var a = [1];"
+ "typeof (a.length = '') == 'string' && a.length == 0"),
+ nxt_string("true") },
+
+ { nxt_string("var a = [1]; "
+ "typeof (a.length = Object(2)) == 'object' && a.length == 2"),
+ nxt_string("true") },
+
+ { nxt_string("var a = [1]; "
+ "typeof (a.length = Object('2')) == 'object'"),
+ nxt_string("true") },
+
+ { nxt_string("var a = [1]; "
+ "a.length = { valueOf: () => 2 }; a.length == 2"),
+ nxt_string("true") },
+
+ { nxt_string("var a = [1]; "
+ "a.length = { toString: () => '2' }; a.length == 2"),
+ nxt_string("true") },
+
{ nxt_string("var a = []; a.length = 0; JSON.stringify(a)"),
nxt_string("[]") },

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel