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.
nodejs · Jun 12, 2012 · 8f1aaee · 8f1aaee
1 parent e3a2dd1
commit 8f1aaee
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/fs.js b/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();
     }
   }