1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: fix base64 decoding

Browse Source 
Make sure trailing garbage is not treated as a valid base64 character.

Fixes: https://github.com/nodejs/node/issues/11987
PR-URL: https://github.com/nodejs/node/pull/11995
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Nikolai Vavilov 2017-03-22 23:31:12 +02:00
parent 7c0079f1be
commit 7e0c3ab641
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base64.h
View File

@ -60,13 +60,13 @@ size_t base64_decode_slow(char* dst, size_t dstlen,
size_t k = 0;
for (;;) {
#define V(expr) \
while (i < srclen) { \
for (;;) { \
const uint8_t c = src[i]; \
lo = unbase64(c); \
i += 1; \
if (lo < 64) \
break; /* Legal character. */ \
if (c == '=') \
if (c == '=' || i >= srclen) \
return k; \
} \
expr; \

4
test/parallel/test-buffer-alloc.js
View File

@ -464,6 +464,10 @@ assert.strictEqual(
// Regression test for https://github.com/nodejs/node/issues/3496.
assert.strictEqual(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0);
// Regression test for https://github.com/nodejs/node/issues/11987.
assert.deepStrictEqual(Buffer.from('w0 ', 'base64'),
Buffer.from('w0', 'base64'));
{
// Creating buffers larger than pool size.
const l = Buffer.poolSize + 5;