Padd base64 strings with = up-to modulo 4 length.

fixes #27

diff --git a/index.js b/index.js
index 284ed1da7cc2fc6d96b2756638f5e02fee41d9db..9ca7cf7bfc17364c60c4d0cdfab0fb139040940c 100644 (file)
--- a/index.js
+++ b/index.js
@@ -4,6 +4,11 @@ exports.SlowBuffer = Buffer;
 Buffer.poolSize = 8192;
 exports.INSPECT_MAX_BYTES = 50;
 
+function stringtrim(str) {
+  if (str.trim) return str.trim();
+  return str.replace(/^\s+|\s+$/g, '');
+}
+
 function Buffer(subject, encoding, offset) {
   if(!assert) assert= require('assert');
   if (!(this instanceof Buffer)) {
@@ -12,6 +17,16 @@ function Buffer(subject, encoding, offset) {
   this.parent = this;
   this.offset = 0;
 
+  // Work-around: node's base64 implementation
+  // allows for non-padded strings while base64-js
+  // does not..
+  if (encoding == "base64" && typeof subject == "string") {
+    subject = stringtrim(subject);
+    while (subject.length % 4 != 0) {
+      subject = subject + "="; 
+    }
+  }
+
   var type;
 
   // Are we slicing?
@@ -496,13 +511,8 @@ function asciiToBytes(str) {
   return byteArray;
 }
 
-function stringtrim(str) {
-  if (str.trim) return str.trim();
-  return str.replace(/^\s+|\s+$/g, '');
-}
-
 function base64ToBytes(str) {
-  return require("base64-js").toByteArray(stringtrim(str));
+  return require("base64-js").toByteArray(str);
 }
 
 function blitBuffer(src, dst, offset, length) {