From 06ed12a67f1bb13d145e8cc4af144fa72b79345b Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 11 Dec 2012 14:45:45 +0100 Subject: [PATCH 1/2] fs: fix ReadStream fd leak Close the file descriptor when a read operation fails. Fixes #4387. --- lib/fs.js | 7 ++-- test/simple/test-fs-read-stream-err.js | 50 ++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 test/simple/test-fs-read-stream-err.js diff --git a/lib/fs.js b/lib/fs.js index 8746740b22e..f9f5ccc9623 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1489,8 +1489,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 00000000000..2c285f183cf --- /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 +}); From ce255756db360a61220be7ed5bdc6741ab49cc29 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 11 Dec 2012 16:01:58 +0100 Subject: [PATCH 2/2] fs: fix WriteStream fd leak Close the file descriptor when a write operation fails. Fixes #4387. --- lib/fs.js | 15 +++++-- test/simple/test-fs-write-stream-err.js | 52 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 test/simple/test-fs-write-stream-err.js diff --git a/lib/fs.js b/lib/fs.js index f9f5ccc9623..83bacc932f2 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1663,10 +1663,19 @@ WriteStream.prototype.flush = function() { if (err) { self.writable = false; - if (cb) { - cb(err); + + function emit() { + self.fd = null; + if (cb) cb(err); + self.emit('error', err); } - self.emit('error', err); + + if (self.fd === null) { + emit(); + } else { + fs.close(self.fd, emit); + } + return; } diff --git a/test/simple/test-fs-write-stream-err.js b/test/simple/test-fs-write-stream-err.js new file mode 100644 index 00000000000..94d249f8967 --- /dev/null +++ b/test/simple/test-fs-write-stream-err.js @@ -0,0 +1,52 @@ +// 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.createWriteStream(common.tmpDir + '/out'); +var err = new Error('BAM'); + +stream.write(new Buffer(256), function() { + var fd = stream.fd; + + fs.write = function() { + var cb = arguments[arguments.length - 1]; + process.nextTick(function() { + cb(err); + }); + }; + + fs.close = function(fd_, cb) { + assert.equal(fd_, fd); + process.nextTick(cb); + }; + + stream.write(new Buffer(256), common.mustCall(function(err_) { + assert.equal(err_, err); + })); + + stream.on('error', common.mustCall(function(err_) { + assert.equal(stream.fd, null); + assert.equal(err_, err); + })); +});