summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2019-05-28 14:01:05 +0200
committerRich Trott <rtrott@gmail.com>2019-05-30 14:35:29 +0200
commitafb84744c6071e77f0738a7ff1a52aaa81db8b77 (patch)
tree32c3876864407c6a19909ec5a8c4b20b789c8b25
parentb1bd9e3dd210d6b20d94c50758e12e93d9dbb3db (diff)
downloadandroid-node-v8-afb84744c6071e77f0738a7ff1a52aaa81db8b77.tar.gz
android-node-v8-afb84744c6071e77f0738a7ff1a52aaa81db8b77.tar.bz2
android-node-v8-afb84744c6071e77f0738a7ff1a52aaa81db8b77.zip
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>
-rw-r--r--lib/_stream_readable.js15
-rw-r--r--test/parallel/test-stream-readable-setEncoding-existing-buffers.js60
2 files changed, 74 insertions, 1 deletions
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 5905c56bd4..163a042f08 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -321,9 +321,22 @@ Readable.prototype.isPaused = function() {
Readable.prototype.setEncoding = function(enc) {
if (!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
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;
};
diff --git a/test/parallel/test-stream-readable-setEncoding-existing-buffers.js b/test/parallel/test-stream-readable-setEncoding-existing-buffers.js
new file mode 100644
index 0000000000..eb75260bac
--- /dev/null
+++ b/test/parallel/test-stream-readable-setEncoding-existing-buffers.js
@@ -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, ['🎉']);
+ });
+}