From 8faabe0d2d267d9abe5f4ad45e3f6804d0f28dad Mon Sep 17 00:00:00 2001
From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Thu, 25 May 2017 14:16:31 +0300
Subject: [PATCH] parseInt() fixed for hexadecimal literals.

---
 njs/njs_number.c         | 33 +++++++++++++++++++--------------
 njs/test/njs_unit_test.c | 21 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/njs/njs_number.c b/njs/njs_number.c
index a11bae1f..d9371f88 100644
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -662,7 +662,7 @@ njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     u_char             *p, *end;
     int64_t            n;
     uint8_t            radix;
-    nxt_bool_t         minus;
+    nxt_bool_t         minus, test_prefix;
     njs_string_prop_t  string;
 
     num = NAN;
@@ -693,25 +693,30 @@ njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
             p++;
         }
 
-        if (end - p > 1 && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
-            p += 2;
-            radix = 16;
+        test_prefix = (end - p > 1);
+
+        if (nargs > 2) {
+            radix = args[2].data.u.number;
+
+            if (radix < 2 || radix > 36) {
+                goto done;
+            }
+
+            if (radix != 16) {
+                test_prefix = 0;
+            }
 
         } else {
             radix = 10;
         }
 
-        if (nargs > 2) {
-            n = args[2].data.u.number;
-
-            if (n != 0) {
-
-                if (n < 2 || n > 36) {
-                    goto done;
-                }
+        if (test_prefix && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
+            p += 2;
+            radix = 16;
+        }
 
-                radix = n;
-            }
+        if (p == end) {
+            goto done;
         }
 
         n = njs_number_radix_parse(p, end, radix, 0);
diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index f6b38e46..bf588b85 100644
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -7047,6 +7047,27 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("parseInt('njscript', 36)"),
       nxt_string("1845449130881") },
 
+    { nxt_string("parseInt('0x')"),
+      nxt_string("NaN") },
+
+    { nxt_string("parseInt('0x', 10)"),
+      nxt_string("0") },
+
+    { nxt_string("parseInt('0x', 16)"),
+      nxt_string("NaN") },
+
+    { nxt_string("parseInt('0x', 33)"),
+      nxt_string("0") },
+
+    { nxt_string("parseInt('0x', 34)"),
+      nxt_string("33") },
+
+    { nxt_string("parseInt('0', 1)"),
+      nxt_string("NaN") },
+
+    { nxt_string("parseInt('0', 37)"),
+      nxt_string("NaN") },
+
     { nxt_string("parseFloat('12345abc')"),
       nxt_string("12345") },
 
-- 
2.47.3