stream: convert existing buffer when calling .setEncoding

Convert already-stored chunks when `.setEncoding()` is called
so that subsequent `data` events will receive decoded strings,
as they expect.

Fixes: https://github.com/nodejs/node/issues/27932

PR-URL: https://github.com/nodejs/node/pull/27936
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Anna Henningsen 2019-05-28 14:01:05 +02:00 committed by Rich Trott
parent b1bd9e3dd2
commit afb84744c6
2 changed files with 74 additions and 1 deletions

View File

@ -321,9 +321,22 @@ Readable.prototype.isPaused = function() {
Readable.prototype.setEncoding = function(enc) { Readable.prototype.setEncoding = function(enc) {
if (!StringDecoder) if (!StringDecoder)
StringDecoder = require('string_decoder').StringDecoder; StringDecoder = require('string_decoder').StringDecoder;
this._readableState.decoder = new StringDecoder(enc); const decoder = new StringDecoder(enc);
this._readableState.decoder = decoder;
// If setEncoding(null), decoder.encoding equals utf8 // If setEncoding(null), decoder.encoding equals utf8
this._readableState.encoding = this._readableState.decoder.encoding; this._readableState.encoding = this._readableState.decoder.encoding;
// Iterate over current buffer to convert already stored Buffers:
let p = this._readableState.buffer.head;
let content = '';
while (p !== null) {
content += decoder.write(p.data);
p = p.next;
}
this._readableState.buffer.clear();
if (content !== '')
this._readableState.buffer.push(content);
this._readableState.length = content.length;
return this; return this;
}; };

View File

@ -0,0 +1,60 @@
'use strict';
require('../common');
const { Readable } = require('stream');
const assert = require('assert');
{
// Call .setEncoding() while there are bytes already in the buffer.
const r = new Readable({ read() {} });
r.push(Buffer.from('a'));
r.push(Buffer.from('b'));
r.setEncoding('utf8');
const chunks = [];
r.on('data', (chunk) => chunks.push(chunk));
process.nextTick(() => {
assert.deepStrictEqual(chunks, ['ab']);
});
}
{
// Call .setEncoding() while the buffer contains a complete,
// but chunked character.
const r = new Readable({ read() {} });
r.push(Buffer.from([0xf0]));
r.push(Buffer.from([0x9f]));
r.push(Buffer.from([0x8e]));
r.push(Buffer.from([0x89]));
r.setEncoding('utf8');
const chunks = [];
r.on('data', (chunk) => chunks.push(chunk));
process.nextTick(() => {
assert.deepStrictEqual(chunks, ['🎉']);
});
}
{
// Call .setEncoding() while the buffer contains an incomplete character,
// and finish the character later.
const r = new Readable({ read() {} });
r.push(Buffer.from([0xf0]));
r.push(Buffer.from([0x9f]));
r.setEncoding('utf8');
r.push(Buffer.from([0x8e]));
r.push(Buffer.from([0x89]));
const chunks = [];
r.on('data', (chunk) => chunks.push(chunk));
process.nextTick(() => {
assert.deepStrictEqual(chunks, ['🎉']);
});
}