fs: fix file descriptor leak in sync functions

Fixes #3202. This is a back-port of commit 4e290e4.

1 files changed, 19 insertions, 15 deletions

diff --git a/lib/fs.js b/lib/fs.js
index 09fbca83fa..5b04e97572 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -131,17 +131,19 @@ fs.readFileSync = function(path, encoding) {
   var nread = 0;
   var lastRead = 0;
 
-  do {
-    if (lastRead) {
-      buffer._bytesRead = lastRead;
-      nread += lastRead;
-      buffers.push(buffer);
-    }
-    var buffer = new Buffer(4048);
-    lastRead = fs.readSync(fd, buffer, 0, buffer.length, null);
-  } while (lastRead > 0);
-
-  fs.closeSync(fd);
+  try {
+    do {
+      if (lastRead) {
+        buffer._bytesRead = lastRead;
+        nread += lastRead;
+        buffers.push(buffer);
+      }
+      var buffer = new Buffer(4048);
+      lastRead = fs.readSync(fd, buffer, 0, buffer.length, null);
+    } while (lastRead > 0);
+  } finally {
+    fs.closeSync(fd);
+  }
 
   if (buffers.length > 1) {
     var offset = 0;
@@ -629,11 +631,13 @@ fs.writeFileSync = function(path, data, encoding) {
   }
   var written = 0;
   var length = data.length;
-  //writeSync(fd, buffer, offset, length, position)
-  while (written < length) {
-    written += fs.writeSync(fd, data, written, length - written, written);
+  try {
+    while (written < length) {
+      written += fs.writeSync(fd, data, written, length - written, written);
+    }
+  } finally {
+    fs.closeSync(fd);
   }
-  fs.closeSync(fd);
 };