Permalink
Browse files

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.
  • Loading branch information...
1 parent 766f609 commit f0c1376e07e6d5a4deb3d088bd3153d7f6af1298 @bnoordhuis bnoordhuis committed Jan 14, 2012
Showing with 22 additions and 1 deletion.
  1. +3 −1 lib/net.js
  2. +19 −0 test/simple/test-net-connect-buffer.js
View
@@ -424,8 +424,10 @@ Socket.prototype.write = function(data, arg1, arg2) {
}
// Change strings to buffers. SLOW
- if (typeof data == 'string') {
+ if (typeof data === 'string') {
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;
@@ -63,6 +63,25 @@ tcp.listen(common.PORT, function() {
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
// `bytesWritten` is incremented with the # of bytes, not # of characters.
var a = "L'État, c'est ";

0 comments on commit f0c1376

Please sign in to comment.