buffer: support decoding of URL-safe base64

nodejs · Feb 21, 2012 · b9127eb · b9127eb
1 parent feff9bb
commit b9127eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
@@ -278,13 +278,15 @@ Handle<Value> Buffer::Ucs2Slice(const Arguments &args) {
 static const char *base64_table = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                   "abcdefghijklmnopqrstuvwxyz"
                                   "0123456789+/";
+
+// supports regular and URL-safe base64
 static const int unbase64_table[] =
   {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-2,-1,-1,-2,-1,-1
   ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
-  ,-2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63
+  ,-2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,62,-1,63
   ,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1
   ,-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14
-  ,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1
+  ,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,63
   ,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40
   ,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1
   ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1

diff --git a/test/simple/test-buffer.js b/test/simple/test-buffer.js
@@ -279,6 +279,12 @@ assert.deepEqual(g, new Buffer([0, 1, 2, 3]));
 // Test toString('base64')
 //
 assert.equal('TWFu', (new Buffer('Man')).toString('base64'));
+
+// test that regular and URL-safe base64 both work
+var expected = [0xff, 0xff, 0xbe, 0xff, 0xef, 0xbf, 0xfb, 0xef, 0xff];
+assert.deepEqual(Buffer('//++/++/++//', 'base64'), Buffer(expected));
+assert.deepEqual(Buffer('__--_--_--__', 'base64'), Buffer(expected));
+
 // big example
 var quote = 'Man is distinguished, not only by his reason, but by this ' +
             'singular passion from other animals, which is a lust ' +