Skip to content
Browse files

fs: fs.readFile should not throw uncaughtException

Reviewed-By: Fedor Indutny <fedor@indutny.com>
  • Loading branch information...
1 parent e643fe4 commit 63a42682187a963873211da8f647fa3c077489f4 @JacksonTian JacksonTian committed with indutny
Showing with 67 additions and 4 deletions.
  1. +7 −4 lib/fs.js
  2. +60 −0 test/pummel/test-fs-readfile-large.js
View
11 lib/fs.js
@@ -239,10 +239,13 @@ fs.readFile = function(path, options, callback_) {
return read();
}
- if (size > kMaxLength)
- throw new RangeError('File size is greater than possible Buffer: ' +
- '0x3FFFFFFF bytes');
-
+ if (size > kMaxLength) {
+ var err = new RangeError('File size is greater than possible Buffer: ' +
+ '0x3FFFFFFF bytes');
+ return fs.close(fd, function() {
+ callback(err);
+ });
+ }
buffer = new Buffer(size);
read();
});
View
60 test/pummel/test-fs-readfile-large.js
@@ -0,0 +1,60 @@
+// 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 path = require('path'),
+ fs = require('fs'),
+ filename = path.join(common.fixturesDir, 'large_file.txt');
+
+var filesize = 1024 * 1024 * 1024;
+
+function makeFile(done) {
+ var buf = new Buffer(filesize / 1024);
+ buf.fill('a');
+
+ try { fs.unlinkSync(filename); } catch (e) {}
+ var w = 1024;
+ var ws = fs.createWriteStream(filename);
+ ws.on('close', done);
+ ws.on('drain', write);
+ write();
+ function write() {
+ do {
+ w--;
+ } while (false !== ws.write(buf) && w > 0);
+ if (w === 0)
+ ws.end();
+ }
+}
+
+makeFile(function () {
+ fs.readFile(filename, function(err) {
+ assert.ok(err, 'should get RangeError');
+ assert.equal(err.name, 'RangeError', 'should get RangeError');
+ try { fs.unlinkSync(filename); } catch (e) {}
+ });
+});
+
+process.on('uncaughtException', function (err) {
+ assert.ok(!err, 'should not throw uncaughtException');
+});

0 comments on commit 63a4268

Please sign in to comment.
Something went wrong with that request. Please try again.