Skip to content

Commit 6aeaf21

Browse files
seishunMylesBorins
authored andcommitted
src: fix base64 decoding
Make sure trailing garbage is not treated as a valid base64 character. Fixes: #11987 PR-URL: #11995 Reviewed-By: Anna Henningsen <[email protected]>
1 parent 6786e6e commit 6aeaf21

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/base64.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ size_t base64_decode_slow(char* dst, size_t dstlen,
6060
size_t k = 0;
6161
for (;;) {
6262
#define V(expr) \
63-
while (i < srclen) { \
63+
for (;;) { \
6464
const uint8_t c = src[i]; \
6565
lo = unbase64(c); \
6666
i += 1; \
6767
if (lo < 64) \
6868
break; /* Legal character. */ \
69-
if (c == '=') \
69+
if (c == '=' || i >= srclen) \
7070
return k; \
7171
} \
7272
expr; \

test/parallel/test-buffer-alloc.js

+4
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,10 @@ assert.strictEqual(
462462
// Regression test for https://github.com/nodejs/node/issues/3496.
463463
assert.strictEqual(Buffer.from('=bad'.repeat(1e4), 'base64').length, 0);
464464

465+
// Regression test for https://github.com/nodejs/node/issues/11987.
466+
assert.deepStrictEqual(Buffer.from('w0 ', 'base64'),
467+
Buffer.from('w0', 'base64'));
468+
465469
{
466470
// Creating buffers larger than pool size.
467471
const l = Buffer.poolSize + 5;

0 commit comments

Comments
 (0)