fs: fix ReadStream fd leak

Close the file descriptor when a read operation fails.

Fixes #4387.

2 files changed, 55 insertions, 2 deletions

diff --git a/lib/fs.js b/lib/fs.js
index 62cbcf01b..d9a0a110e 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -1318,8 +1318,11 @@ ReadStream.prototype._read = function() {
   function afterRead(err, bytesRead) {
     self.reading = false;
     if (err) {
-      self.emit('error', err);
-      self.readable = false;
+      fs.close(self.fd, function() {
+        self.fd = null;
+        self.emit('error', err);
+        self.readable = false;
+      });
       return;
     }
 
diff --git a/test/simple/test-fs-read-stream-err.js b/test/simple/test-fs-read-stream-err.js
new file mode 100644
index 000000000..2c285f183
--- /dev/null
+++ b/test/simple/test-fs-read-stream-err.js
@@ -0,0 +1,50 @@
+// 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 fs = require('fs');
+
+var stream = fs.createReadStream(__filename, { bufferSize: 64 });
+var err = new Error('BAM');
+
+stream.on('data', function(buf) {
+  var fd = stream.fd;
+
+  fs.read = function() {
+    var cb = arguments[arguments.length - 1];
+    process.nextTick(function() {
+      cb(err);
+    });
+  };
+
+  fs.close = common.mustCall(function(fd_, cb) {
+    assert.equal(fd_, fd);
+    process.nextTick(cb);
+  });
+
+  stream.on('error', common.mustCall(function(err_) {
+    assert.equal(stream.fd, null);
+    assert.equal(err_, err);
+  }));
+
+  stream.on('data', assert.fail);  // no more 'data' events should follow
+});