From c75f71dd721d04e03204ffcc290bb3a370275cce Mon Sep 17 00:00:00 2001 From: isaacs Date: Mon, 9 Apr 2012 08:39:13 -0700 Subject: [PATCH 1/2] 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. --- lib/fs.js | 7 +-- .../test-fs-write-stream-change-open.js | 52 +++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 test/simple/test-fs-write-stream-change-open.js diff --git a/lib/fs.js b/lib/fs.js index b30e121fdc7..a62e083293e 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1253,7 +1253,8 @@ var WriteStream = fs.WriteStream = function(path, options) { this._queue = []; if (this.fd === null) { - this._queue.push([fs.open, this.path, this.flags, this.mode, undefined]); + this._open = fs.open; + this._queue.push([this._open, this.path, this.flags, this.mode, undefined]); this.flush(); } }; @@ -1295,7 +1296,7 @@ WriteStream.prototype.flush = function() { cb(null, arguments[1]); } - } else if (method === fs.open) { + } else if (method === self._open) { // save reference for file pointer self.fd = arguments[1]; self.emit('open', self.fd); @@ -1313,7 +1314,7 @@ WriteStream.prototype.flush = function() { }); // Inject the file pointer - if (method !== fs.open) { + if (method !== self._open) { args.unshift(this.fd); } diff --git a/test/simple/test-fs-write-stream-change-open.js b/test/simple/test-fs-write-stream-change-open.js new file mode 100644 index 00000000000..d025e8da35a --- /dev/null +++ b/test/simple/test-fs-write-stream-change-open.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 path = require('path'), + fs = require('fs'); + +var file = path.join(common.tmpDir, 'write.txt'); + +var stream = fs.WriteStream(file), + _fs_close = fs.close, + _fs_open = fs.open; + +// change the fs.open with an identical function after the WriteStream +// has pushed it onto its internal action queue, but before it's +// returned. This simulates AOP-style extension of the fs lib. +fs.open = function() { + return _fs_open.apply(fs, arguments); +}; + +fs.close = function(fd) { + assert.ok(fd, 'fs.close must not be called with an undefined fd.'); + fs.close = _fs_close; + fs.open = _fs_open; +} + +stream.write('foo'); +stream.end(); + +process.on('exit', function() { + assert.equal(fs.open, _fs_open); +}); From f160a45b254e591eb33716311c92be533c6d86c4 Mon Sep 17 00:00:00 2001 From: isaacs Date: Sat, 7 Apr 2012 16:59:54 -0700 Subject: [PATCH 2/2] 2012.04.09 Version 0.6.15 (stable) * Update npm to 1.1.16 * Show licenses in binary installers. * unix: add uv_fs_read64, uv_fs_write64 and uv_fs_ftruncate64 (Ben Noordhuis) * add 64bit offset fs functions (Igor Zinkovsky) * windows: don't report ENOTSOCK when attempting to bind an udp handle twice (Bert Belder) * windows: backport pipe-connect-to-file fixes from master (Bert Belder) * windows: never call fs event callbacks after closing the watcher (Bert Belder) * fs.readFile: don't make the callback before the fd is closed (Bert Belder) * windows: use 64bit offsets for uv_fs apis (Igor Zinkovsky) * Fix #2061: segmentation fault on OS X due to stat size mismatch (Ben Noordhuis) --- ChangeLog | 25 ++++++++++++++++++++++++- doc/community/index.html | 2 +- src/node_version.h | 2 +- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef7d3fccbfb..3fec4ac26a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,27 @@ -2012.03.22 Version 0.6.14 (stable) +2012.04.09 Version 0.6.15 (stable) + +* Update npm to 1.1.16 + +* Show licenses in binary installers. + +* unix: add uv_fs_read64, uv_fs_write64 and uv_fs_ftruncate64 (Ben Noordhuis) + +* add 64bit offset fs functions (Igor Zinkovsky) + +* windows: don't report ENOTSOCK when attempting to bind an udp handle twice (Bert Belder) + +* windows: backport pipe-connect-to-file fixes from master (Bert Belder) + +* windows: never call fs event callbacks after closing the watcher (Bert Belder) + +* fs.readFile: don't make the callback before the fd is closed (Bert Belder) + +* windows: use 64bit offsets for uv_fs apis (Igor Zinkovsky) + +* Fix #2061: segmentation fault on OS X due to stat size mismatch (Ben Noordhuis) + + +2012.03.22 Version 0.6.14 (stable), e513ffef7549a56a5af728e1f0c2c0c8f290518a * net: don't crash when queued write fails (Igor Zinkovsky) diff --git a/doc/community/index.html b/doc/community/index.html index 644c09833bb..13f73230b0b 100644 --- a/doc/community/index.html +++ b/doc/community/index.html @@ -146,7 +146,7 @@
Node Hispano Spanish language community
- October Sky JS Korean Node.js community + OctoberSkyJs Korea Node.js community

diff --git a/src/node_version.h b/src/node_version.h index de8050f3317..07e548e0dcc 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_MAJOR_VERSION 0 #define NODE_MINOR_VERSION 6 #define NODE_PATCH_VERSION 15 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)