Merge branch 'master' into fix-issue-755

nginx · Jul 10, 2024 · 194112d · 194112d
2 parents 662be21 + b593dd4
commit 194112d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/njs_function.c b/src/njs_function.c
@@ -1054,9 +1054,11 @@ njs_function_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     njs_chb_append_literal(&chain, "){");
 
-    ret = njs_value_to_chain(vm, &chain, njs_argument(args, nargs - 1));
-    if (njs_slow_path(ret < NJS_OK)) {
-        return ret;
+    if (nargs > 1) {
+        ret = njs_value_to_chain(vm, &chain, njs_argument(args, nargs - 1));
+        if (njs_slow_path(ret < NJS_OK)) {
+            return ret;
+        }
     }
 
     njs_chb_append_literal(&chain, "})");

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
@@ -14163,6 +14163,9 @@ static njs_unit_test_t  njs_test[] =
     { njs_str("Function.constructor === Function"),
       njs_str("true") },
 
+    { njs_str("Function.constructor()"),
+      njs_str("[object Function]") },
+
     { njs_str("function f() {} f.__proto__ === Function.prototype"),
       njs_str("true") },