Skip to content

Commit

Permalink
stream: fix undefined in Readable object mode
Browse files Browse the repository at this point in the history
Fixes `this.push(undefined)`.

Fixes: #13753
PR-URL: #13760
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Calvin Metcalf <calvin.metcalf@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
addaleax committed Jun 21, 2017
1 parent 57b7285 commit 5840138
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) {
stream.emit('error', er);
} else if (state.objectMode || chunk && chunk.length > 0) {
if (typeof chunk !== 'string' &&
Object.getPrototypeOf(chunk) !== Buffer.prototype &&
!state.objectMode) {
!state.objectMode &&
Object.getPrototypeOf(chunk) !== Buffer.prototype) {
chunk = Stream._uint8ArrayToBuffer(chunk);
}

Expand Down
44 changes: 44 additions & 0 deletions test/parallel/test-stream-objectmode-undefined.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { Readable, Writable, Transform } = require('stream');

{
const stream = new Readable({
objectMode: true,
read: common.mustCall(() => {
stream.push(undefined);
stream.push(null);
})
});

stream.on('data', common.mustCall((chunk) => {
assert.strictEqual(chunk, undefined);
}));
}

{
const stream = new Writable({
objectMode: true,
write: common.mustCall((chunk) => {
assert.strictEqual(chunk, undefined);
})
});

stream.write(undefined);
}

{
const stream = new Transform({
objectMode: true,
transform: common.mustCall((chunk) => {
stream.push(chunk);
})
});

stream.on('data', common.mustCall((chunk) => {
assert.strictEqual(chunk, undefined);
}));

stream.write(undefined);
}

0 comments on commit 5840138

Please sign in to comment.