Fixed atob() with non-padded base64 strings.

This fixes #695 issue on Github.

diff --git a/src/njs_string.c b/src/njs_string.c
index 3a944ecd910c411f78e2218bf146704aa4922320..f22ab43a2519dddf8bb6e276b2557aa2d5b592eb 100644 (file)
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -4298,7 +4298,14 @@ njs_string_atob(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         }
     }
 
-    len = njs_base64_decoded_length(str.length, pad);
+    len = str.length;
+
+    if (len % 4 != 0) {
+        pad = 4 - (len % 4);
+        len += pad;
+    }
+
+    len = njs_base64_decoded_length(len, pad);
 
     njs_chb_init(&chain, vm->mem_pool);
 

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index 4e54c7121b894af28fcfe1949483c3c46b9b46db..636157700c37eea55b1609a7937ba8fb007a59b6 100644 (file)
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -10093,6 +10093,18 @@ static njs_unit_test_t  njs_test[] =
               "].every(v => c(atob(v)).toString() == '8,52,86')"),
       njs_str("true")},
 
+    { njs_str("atob('aGVsbG8=')"),
+      njs_str("hello") },
+
+    { njs_str("atob('aGVsbG8')"),
+      njs_str("hello") },
+
+    { njs_str("atob('TQ==')"),
+      njs_str("M") },
+
+    { njs_str("atob('TQ')"),
+      njs_str("M") },
+
     /* Functions. */
 
     { njs_str("return"),