Check if a stream has a valid fd before read_start

Closes #3118
nodejs · Jun 16, 2012 · 8d5c120 · 8d5c120
1 parent bdd57f0
commit 8d5c120
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 0 deletions.
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
@@ -132,6 +132,10 @@ Handle<Value> StreamWrap::ReadStart(const Arguments& args) {
 
   UNWRAP(StreamWrap)
 
+  // Probably the user did .pause() and then an immediate .resume()
+  // before the fd had been set up. Don't even try to set up.
+  if (wrap->stream_->fd < 0) return scope.Close(Integer::New(1));
+
   bool ipc_pipe = wrap->stream_->type == UV_NAMED_PIPE &&
                   ((uv_pipe_t*)wrap->stream_)->ipc;
   int r;

diff --git a/test/simple/test-net-resume-pause.js b/test/simple/test-net-resume-pause.js
@@ -0,0 +1,85 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+var net = require('net');
+
+var received = false;
+
+// issue 3118
+var client = net.connect(12345, "localhost");
+client.on('error', function(err) {
+  assert.equal(err.message, 'connect ECONNREFUSED');
+});
+client.pause();
+client.resume();
+
+var server = net.createServer(function(socket) {
+  socket.on('data', function() {
+    socket.write('important data\r\n');
+  });
+
+  socket.on('end', function() {
+    socket.end();
+  });
+
+  socket.on('close', function(hadError) {
+    assert.equal(false, hadError);
+  });
+});
+
+server.listen(common.PORT, function() {
+  var resumed = false;
+
+  var client = net.createConnection(common.PORT);
+  client.setEncoding('UTF8');
+
+  client.on('connect', function() {
+    client.write('start\r\n');
+    client.pause();
+
+    setTimeout(function() {
+      client.resume();
+      resumed = true;
+    }, 500);
+  });
+
+  client.on('data', function(chunk) {
+    assert.equal('important data\r\n', chunk);
+
+    assert(resumed, 'got data before resume');
+
+    received = true;
+    client.end();
+  });
+
+  client.on('close', function(hadError) {
+    assert.equal(false, hadError);
+    server.close();
+  });
+});
+
+process.on('exit', function() {
+  assert(received);
+});
+