Fixed parseInt() zero radix parsing.

diff --git a/njs/njs_number.c b/njs/njs_number.c
index 6223b76d317a329e909741f8d5d79a356e8529ae..1d19d37ef955fc7468e08da3e9a1c57464eb50bd 100644 (file)
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -733,19 +733,23 @@ njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
         }
 
         test_prefix = (end - p > 1);
+        radix = 0;
 
         if (nargs > 2) {
             radix = args[2].data.u.number;
 
-            if (radix < 2 || radix > 36) {
-                goto done;
-            }
+            if (radix != 0) {
+                if (radix < 2 || radix > 36) {
+                    goto done;
+                }
 
-            if (radix != 16) {
-                test_prefix = 0;
+                if (radix != 16) {
+                    test_prefix = 0;
+                }
             }
+        }
 
-        } else {
+        if (radix == 0) {
             radix = 10;
         }
 

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index b339d775f6b0c6b56ad26dbeaafa469ef70e597e..fe1888376f3f057f00bf27ce855dd84dbfe1cb1f 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -7144,6 +7144,12 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("parseInt('12345abc')"),
       nxt_string("12345") },
 
+    { nxt_string("parseInt('123', 0)"),
+      nxt_string("123") },
+
+    { nxt_string("parseInt('0XaBc', 0)"),
+      nxt_string("2748") },
+
     { nxt_string("parseInt('1010', 2)"),
       nxt_string("10") },