1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Closes GH-535 Immediate pause/resume race condition

Browse Source 
Calling resume() immediately after calling pause() would trigger
a race condition where it would try to read() from a file
descriptor that was already being read from, causing an EBADF
This commit is contained in:
isaacs 2011-03-29 14:54:49 -07:00 committed by Ryan Dahl
parent 4d64f36338
commit e1a72f0e2e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/fs.js
View File

@ -838,7 +838,9 @@ ReadStream.prototype.setEncoding = function(encoding) {
ReadStream.prototype._read = function() { ReadStream.prototype._read = function() {
var self = this; var self = this;
if (!self.readable || self.paused) return; if (!self.readable || self.paused || self.reading) return;
self.reading = true;
if (!pool || pool.length - pool.used < kMinPoolSpace) { if (!pool || pool.length - pool.used < kMinPoolSpace) {
// discard the old pool. Can't add to the free list because // discard the old pool. Can't add to the free list because
@ -864,6 +866,7 @@ ReadStream.prototype._read = function() {
} }
function afterRead(err, bytesRead) { function afterRead(err, bytesRead) {
self.reading = false;
if (err) { if (err) {
self.emit('error', err); self.emit('error', err);
self.readable = false; self.readable = false;

7
test/simple/test-fs-read-stream.js
View File

@ -42,8 +42,13 @@ file.addListener('open', function(fd) {
callbacks.open++; callbacks.open++;
assert.equal('number', typeof fd); assert.equal('number', typeof fd);
assert.ok(file.readable); assert.ok(file.readable);
});
// GH-535
file.pause();
file.resume();
file.pause();
file.resume();
});
file.addListener('data', function(data) { file.addListener('data', function(data) {
assert.ok(data instanceof Buffer); assert.ok(data instanceof Buffer);