net: make .write() throw on bad input

Passing a non-buffer or non-string argument to Socket.prototype.write triggered
an assert:

  Assertion failed: (Buffer::HasInstance(args[0])), function Write,
  file ../src/stream_wrap.cc, line 289.

Fixes #2532.
This commit is contained in:
Ben Noordhuis 2012-01-14 02:13:22 +01:00
parent 766f609838
commit f0c1376e07
2 changed files with 22 additions and 1 deletions

View File

@ -424,8 +424,10 @@ Socket.prototype.write = function(data, arg1, arg2) {
} }
// Change strings to buffers. SLOW // Change strings to buffers. SLOW
if (typeof data == 'string') { if (typeof data === 'string') {
data = new Buffer(data, encoding); data = new Buffer(data, encoding);
} else if (!Buffer.isBuffer(data)) {
throw new TypeError("First argument must be a buffer or a string.");
} }
this.bytesWritten += data.length; this.bytesWritten += data.length;

View File

@ -63,6 +63,25 @@ tcp.listen(common.PORT, function() {
assert.equal('opening', socket.readyState); assert.equal('opening', socket.readyState);
// Make sure that anything besides a buffer or a string throws.
[ null,
true,
false,
undefined,
1,
1.0,
1 / 0,
+Infinity
-Infinity,
[],
{}
].forEach(function(v) {
function f() {
socket.write(v);
}
assert.throws(f, TypeError);
});
// Write a string that contains a multi-byte character sequence to test that // Write a string that contains a multi-byte character sequence to test that
// `bytesWritten` is incremented with the # of bytes, not # of characters. // `bytesWritten` is incremented with the # of bytes, not # of characters.
var a = "L'État, c'est "; var a = "L'État, c'est ";