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

fs: fix infinite loop in fs.readFile()

Fix an infinite loop in the case where the file got truncated by a concurrent
writer while fs.readFile() was busy reading in the file.
  • Loading branch information...
bnoordhuis committed Jun 12, 2012
1 parent e3a2dd1 commit 408bfece510520d73d9e19629450dfec691cc1e6
Showing with 8 additions and 6 deletions.
  1. +8 −6 lib/fs.js
@@ -148,18 +148,18 @@ fs.readFile = function(path, encoding_) {
});
}

if (bytesRead === 0) {
return close();
}

pos += bytesRead;
if (size !== 0) {
if (pos === size) close();
else read();
} else {
// unknown size, just read until we don't get bytes.
if (bytesRead > 0) {
buffers.push(buffer.slice(0, bytesRead));
read();
} else {
close();
}
buffers.push(buffer.slice(0, bytesRead));
read();
}
}

@@ -168,6 +168,8 @@ fs.readFile = function(path, encoding_) {
if (size === 0) {
// collected the data into the buffers list.
buffer = Buffer.concat(buffers, pos);
} else if (pos < size) {
buffer = buffer.slice(0, pos);
}

if (encoding) buffer = buffer.toString(encoding);

0 comments on commit 408bfec

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