Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

fs: no end emit after createReadStream.pause()

In case a fd option is given to fs.createReadStream a read will instantly
happen. But in the edge case where fd point to an empty file and .pause()
was executed instantly, the end event would emit since no async wait was
between fs.createReadStream and the file read there emits end.

This is a cherry-pick of commit 1f3e4a7 into the v0.6 branch.
  • Loading branch information
AndreasMadsen authored and bnoordhuis committed May 26, 2012
1 parent 5ff2ae8 commit 2ae9b69871427697cf7c0abb6cd345f9778cc7a5
Showing with 69 additions and 1 deletion.
  1. +3 −1 lib/fs.js
  2. +66 −0 test/simple/test-fs-empty-readStream.js
@@ -1068,7 +1068,9 @@ var ReadStream = fs.ReadStream = function(path, options) {
}

if (this.fd !== null) {
this._read();
process.nextTick(function () {
self._read();
});
return;
}

@@ -0,0 +1,66 @@
// 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');
var fs = require('fs');

var emptyFile = path.join(common.fixturesDir, 'empty.txt');

fs.open(emptyFile, 'r', function (error, fd) {
assert.ifError(error);

var read = fs.createReadStream(emptyFile, { 'fd': fd });

read.once('data', function () {
throw new Error("data event should not emit");
});

var readEmit = false;
read.once('end', function () {
readEmit = true;
});

setTimeout(function () {
assert.equal(readEmit, true);
}, 50);
});

fs.open(emptyFile, 'r', function (error, fd) {
assert.ifError(error);

var read = fs.createReadStream(emptyFile, { 'fd': fd });
read.pause();

read.once('data', function () {
throw new Error("data event should not emit");
});

var readEmit = false;
read.once('end', function () {
readEmit = true;
});

setTimeout(function () {
assert.equal(readEmit, false);
}, 50);
});

0 comments on commit 2ae9b69

Please sign in to comment.
You can’t perform that action at this time.