Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 3bcfc12

Browse files
committed
fix fs.truncate when first arg is an int fd
added unit test added note to the doc improved makeCallback arg checking
1 parent d8baf8a commit 3bcfc12

File tree

3 files changed

+52
-4
lines changed

3 files changed

+52
-4
lines changed

doc/api/fs.markdown

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Synchronous ftruncate(2).
107107

108108
Asynchronous truncate(2). No arguments other than a possible exception are
109109
given to the completion callback.
110+
Currently, fs.truncate also accepts a file descriptor as first argument but
111+
you should use fs.ftruncate in this case as this fallback may go away.
110112

111113
## fs.truncateSync(path, len)
112114

lib/fs.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,12 @@ function maybeCallback(cb) {
9191
// for callbacks that are passed to the binding layer, callbacks that are
9292
// invoked from JS already run in the proper scope.
9393
function makeCallback(cb) {
94-
if (!util.isFunction(cb)) {
94+
if (util.ifNullOrUndefined(cb)) {
9595
return rethrow();
9696
}
97+
if (!util.isFunction(cb)) {
98+
throw new Error('callback must be a function');
99+
}
97100

98101
return function() {
99102
return cb.apply(null, arguments);
@@ -641,9 +644,7 @@ fs.renameSync = function(oldPath, newPath) {
641644

642645
fs.truncate = function(path, len, callback) {
643646
if (util.isNumber(path)) {
644-
var req = new FSReqWrap();
645-
req.oncomplete = callback;
646-
return fs.ftruncate(path, len, req);
647+
return fs.ftruncate(path, len, callback);
647648
}
648649
if (util.isFunction(len)) {
649650
callback = len;

test/simple/test-regress-GH-9161.js

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var path = require('path');
25+
var fs = require('fs');
26+
var tmp = common.tmpDir;
27+
if (!fs.existsSync(tmp))
28+
fs.mkdirSync(tmp);
29+
var filename = path.resolve(tmp, 'truncate-file.txt');
30+
31+
var success = 0;
32+
33+
fs.writeFileSync(filename, 'hello world', 'utf8');
34+
var fd = fs.openSync(filename, 'r+');
35+
fs.truncate(fd, 5, function(err) {
36+
assert.ok(!err);
37+
success++;
38+
});
39+
40+
process.on('exit', function() {
41+
fs.closeSync(fd);
42+
fs.unlinkSync(filename);
43+
assert.equal(success, 1);
44+
console.log('ok');
45+
});

0 commit comments

Comments
 (0)