Skip to content

Commit

Permalink
stream: write should throw on unknown encoding
Browse files Browse the repository at this point in the history
Validate encoding passed to write(chunk, encoding, cb) and
throw if it is invalid.

PR-URL: #33075
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
  • Loading branch information
ronag committed Apr 28, 2020
1 parent 563efb7 commit 4bc7025
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
2 changes: 2 additions & 0 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ Writable.prototype.write = function(chunk, encoding, cb) {
} else {
if (!encoding)
encoding = state.defaultEncoding;
else if (encoding !== 'buffer' && !Buffer.isEncoding(encoding))
throw new ERR_UNKNOWN_ENCODING(encoding);
if (typeof cb !== 'function')
cb = nop;
}
Expand Down
23 changes: 16 additions & 7 deletions test/parallel/test-stream-writable-write-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ const assert = require('assert');

const { Writable } = require('stream');

function expectError(w, arg, code, sync) {
function expectError(w, args, code, sync) {
if (sync) {
if (code) {
assert.throws(() => w.write(arg), { code });
assert.throws(() => w.write(...args), { code });
} else {
w.write(arg);
w.write(...args);
}
} else {
let errorCalled = false;
let ticked = false;
w.write(arg, common.mustCall((err) => {
w.write(...args, common.mustCall((err) => {
assert.strictEqual(ticked, true);
assert.strictEqual(errorCalled, false);
assert.strictEqual(err.code, code);
Expand All @@ -34,7 +34,7 @@ function test(autoDestroy) {
_write() {}
});
w.end();
expectError(w, 'asd', 'ERR_STREAM_WRITE_AFTER_END');
expectError(w, ['asd'], 'ERR_STREAM_WRITE_AFTER_END');
}

{
Expand All @@ -50,15 +50,24 @@ function test(autoDestroy) {
autoDestroy,
_write() {}
});
expectError(w, null, 'ERR_STREAM_NULL_VALUES', true);
expectError(w, [null], 'ERR_STREAM_NULL_VALUES', true);
}

{
const w = new Writable({
autoDestroy,
_write() {}
});
expectError(w, {}, 'ERR_INVALID_ARG_TYPE', true);
expectError(w, [{}], 'ERR_INVALID_ARG_TYPE', true);
}

{
const w = new Writable({
decodeStrings: false,
autoDestroy,
_write() {}
});
expectError(w, ['asd', 'noencoding'], 'ERR_UNKNOWN_ENCODING', true);
}
}

Expand Down

0 comments on commit 4bc7025

Please sign in to comment.