fs: fix infinite loop in fs.readFileSync()

Fix an infinite loop in the case where the file got truncated by a concurrent writer while fs.readFileSync() was busy reading in the file.
nodejs · Jun 12, 2012 · 0385b17 · 0385b17 · shigeki · Jun 12, 2012
1 parent 408bfec
commit 0385b17
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/lib/fs.js b/lib/fs.js
@@ -221,19 +221,16 @@ fs.readFileSync = function(path, encoding) {
     }
 
     pos += bytesRead;
-
-    if (size !== 0) {
-      done = pos >= size;
-    } else {
-      done = bytesRead >= 0;
-    }
+    done = (bytesRead === 0) || (size !== 0 && pos >= size);
   }
 
   fs.closeSync(fd);
 
   if (size === 0) {
     // data was collected into the buffers list.
     buffer = Buffer.concat(buffers, pos);
+  } else if (pos < size) {
+    buffer = buffer.slice(0, pos);
   }
 
   if (encoding) buffer = buffer.toString(encoding);