Browse Source

stream_wrap: error if stream has StringDecoder

If `.setEncoding` was called on input stream - all emitted `data` will
be `String`s instances, not `Buffer`s. This is unacceptable for
`StreamWrap`, and should not lead to the crash.

Fix: https://github.com/nodejs/node/issues/3970
PR-URL: https://github.com/nodejs/node/pull/4031
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
process-exit-stdio-flushing
Fedor Indutny 9 years ago
parent
commit
de2fd63612
  1. 16
      lib/_stream_wrap.js
  2. 23
      test/parallel/test-stream-wrap-encoding.js

16
lib/_stream_wrap.js

@ -4,6 +4,7 @@ const assert = require('assert');
const util = require('util'); const util = require('util');
const Socket = require('net').Socket; const Socket = require('net').Socket;
const JSStream = process.binding('js_stream').JSStream; const JSStream = process.binding('js_stream').JSStream;
const Buffer = require('buffer').Buffer;
const uv = process.binding('uv'); const uv = process.binding('uv');
const debug = util.debuglog('stream_wrap'); const debug = util.debuglog('stream_wrap');
@ -39,15 +40,24 @@ function StreamWrap(stream) {
}; };
this.stream.pause(); this.stream.pause();
this.stream.on('error', function(err) { this.stream.on('error', function onerror(err) {
self.emit('error', err); self.emit('error', err);
}); });
this.stream.on('data', function(chunk) { this.stream.on('data', function ondata(chunk) {
if (!(chunk instanceof Buffer)) {
// Make sure that no further `data` events will happen
this.pause();
this.removeListener('data', ondata);
self.emit('error', new Error('Stream has StringDecoder'));
return;
}
debug('data', chunk.length); debug('data', chunk.length);
if (self._handle) if (self._handle)
self._handle.readBuffer(chunk); self._handle.readBuffer(chunk);
}); });
this.stream.once('end', function() { this.stream.once('end', function onend() {
debug('end'); debug('end');
if (self._handle) if (self._handle)
self._handle.emitEOF(); self._handle.emitEOF();

23
test/parallel/test-stream-wrap-encoding.js

@ -0,0 +1,23 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const StreamWrap = require('_stream_wrap');
const Duplex = require('stream').Duplex;
const stream = new Duplex({
read: function() {
},
write: function() {
}
});
stream.setEncoding('ascii');
const wrap = new StreamWrap(stream);
wrap.on('error', common.mustCall(function(err) {
assert(/StringDecoder/.test(err.message));
}));
stream.push('ohai');
Loading…
Cancel
Save