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

unguarded fs.watchFile cache statWatchers checking fixed #1637

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,9 @@ StatWatcher.prototype.stop = function() {


var statWatchers = {};
function inStatWatchers(filename) {
return Object.prototype.hasOwnProperty.call(statWatchers, filename);
}


fs.watchFile = function(filename) {
Expand All @@ -636,11 +639,10 @@ fs.watchFile = function(filename) {
if (options.persistent === undefined) options.persistent = true;
if (options.interval === undefined) options.interval = 0;

if (statWatchers[filename]) {
if (inStatWatchers(filename)) {
stat = statWatchers[filename];
} else {
statWatchers[filename] = new StatWatcher();
stat = statWatchers[filename];
stat = statWatchers[filename] = new StatWatcher();
stat.start(filename, options.persistent, options.interval);
}
stat.addListener('change', listener);
Expand All @@ -649,7 +651,7 @@ fs.watchFile = function(filename) {

fs.unwatchFile = function(filename) {
var stat;
if (statWatchers[filename]) {
if (inStatWatchers(filename)) {
stat = statWatchers[filename];
stat.stop();
statWatchers[filename] = undefined;
Expand Down
62 changes: 55 additions & 7 deletions test/simple/test-fs-watch-file.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,33 @@ var assert = require('assert');
var path = require('path');
var fs = require('fs');

var watchSeenOne = 0;
var watchSeenTwo = 0;

var filename = path.join(common.fixturesDir, 'watch.txt');
fs.writeFileSync(filename, "hello");
var startDir = process.cwd();
var testDir = common.fixturesDir;

var filenameOne = 'watch.txt';
var filepathOne = path.join(testDir, filenameOne);

var filenameTwo = 'hasOwnProperty';
var filepathTwo = filenameTwo;
var filepathTwoAbs = path.join(testDir, filenameTwo);


process.addListener('exit', function() {
fs.unlinkSync(filepathOne);
fs.unlinkSync(filepathTwoAbs);
assert.equal(1, watchSeenOne);
assert.equal(1, watchSeenTwo);
});


fs.writeFileSync(filepathOne, "hello");

assert.throws(
function() {
fs.watchFile(filename);
fs.watchFile(filepathOne);
},
function(e) {
return e.message === 'watchFile requires a listener function';
Expand All @@ -42,14 +62,42 @@ assert.throws(

assert.doesNotThrow(
function() {
fs.watchFile(filename, function(curr, prev) {
fs.unwatchFile(filename);
fs.unlinkSync(filename);
fs.watchFile(filepathOne, function(curr, prev) {
fs.unwatchFile(filepathOne);
++watchSeenOne;
});
}
);

setTimeout(function() {
fs.writeFileSync(filename, "world");
fs.writeFileSync(filepathOne, "world");
}, 1000);


process.chdir(testDir);

fs.writeFileSync(filepathTwoAbs, "howdy");

assert.throws(
function() {
fs.watchFile(filepathTwo);
},
function(e) {
return e.message === 'watchFile requires a listener function';
}
);

assert.doesNotThrow(
function() {
fs.watchFile(filepathTwo, function(curr, prev) {
fs.unwatchFile(filepathTwo);
++watchSeenTwo;
});
}
);

setTimeout(function() {
fs.writeFileSync(filepathTwoAbs, "pardner");
}, 1000);