Skip to content

Commit c75f71d

Browse files
committed
fs.WriteStream: Handle modifications to fs.open
If the fs.open method is modified via AOP-style extension, in between the creation of an fs.WriteStream and the processing of its action queue, then the test of whether or not the method === fs.open will fail, because fs.open has been replaced. The solution is to save a reference to fs.open on the stream itself when the action is placed in the queue. This fixes isaacs/node-graceful-fs#6.
1 parent 45b772d commit c75f71d

File tree

2 files changed

+56
-3
lines changed

2 files changed

+56
-3
lines changed

lib/fs.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,8 @@ var WriteStream = fs.WriteStream = function(path, options) {
12531253
this._queue = [];
12541254

12551255
if (this.fd === null) {
1256-
this._queue.push([fs.open, this.path, this.flags, this.mode, undefined]);
1256+
this._open = fs.open;
1257+
this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
12571258
this.flush();
12581259
}
12591260
};
@@ -1295,7 +1296,7 @@ WriteStream.prototype.flush = function() {
12951296
cb(null, arguments[1]);
12961297
}
12971298

1298-
} else if (method === fs.open) {
1299+
} else if (method === self._open) {
12991300
// save reference for file pointer
13001301
self.fd = arguments[1];
13011302
self.emit('open', self.fd);
@@ -1313,7 +1314,7 @@ WriteStream.prototype.flush = function() {
13131314
});
13141315

13151316
// Inject the file pointer
1316-
if (method !== fs.open) {
1317+
if (method !== self._open) {
13171318
args.unshift(this.fd);
13181319
}
13191320

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
25+
var path = require('path'),
26+
fs = require('fs');
27+
28+
var file = path.join(common.tmpDir, 'write.txt');
29+
30+
var stream = fs.WriteStream(file),
31+
_fs_close = fs.close,
32+
_fs_open = fs.open;
33+
34+
// change the fs.open with an identical function after the WriteStream
35+
// has pushed it onto its internal action queue, but before it's
36+
// returned. This simulates AOP-style extension of the fs lib.
37+
fs.open = function() {
38+
return _fs_open.apply(fs, arguments);
39+
};
40+
41+
fs.close = function(fd) {
42+
assert.ok(fd, 'fs.close must not be called with an undefined fd.');
43+
fs.close = _fs_close;
44+
fs.open = _fs_open;
45+
}
46+
47+
stream.write('foo');
48+
stream.end();
49+
50+
process.on('exit', function() {
51+
assert.equal(fs.open, _fs_open);
52+
});

0 commit comments

Comments
 (0)