Merge pull request #10160 from liusy182/liusy182-10128-asar

Return empty string when fs.readFile with 'utf8' option from asar file
electron · Aug 8, 2017 · 72d2e17 · 72d2e17
2 parents ccdff72 + f56abac
commit 72d2e17
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/lib/common/asar.js b/lib/common/asar.js
@@ -457,8 +457,18 @@
       }
       if (typeof options === 'function') {
         callback = options
-        options = void 0
+        options = {
+          encoding: null
+        }
+      } else if (util.isString(options)) {
+        options = {
+          encoding: options
+        }
+      } else if (!util.isObject(options)) {
+        throw new TypeError('Bad arguments')
       }
+      const {encoding} = options
+
       const archive = getOrCreateArchive(asarPath)
       if (!archive) {
         return invalidArchiveError(asarPath, callback)
@@ -469,25 +479,14 @@
       }
       if (info.size === 0) {
         return process.nextTick(function () {
-          callback(null, new Buffer(0))
+          callback(null, encoding ? '' : new Buffer(0))
         })
       }
       if (info.unpacked) {
         const realPath = archive.copyFileOut(filePath)
         return fs.readFile(realPath, options, callback)
       }
-      if (!options) {
-        options = {
-          encoding: null
-        }
-      } else if (util.isString(options)) {
-        options = {
-          encoding: options
-        }
-      } else if (!util.isObject(options)) {
-        throw new TypeError('Bad arguments')
-      }
-      const {encoding} = options
+
       const buffer = new Buffer(info.size)
       const fd = archive.getFd()
       if (!(fd >= 0)) {

diff --git a/spec/asar-spec.js b/spec/asar-spec.js
@@ -99,6 +99,15 @@ describe('asar package', function () {
         })
       })
 
+      it('reads from a empty file with encoding', function (done) {
+        var p = path.join(fixtures, 'asar', 'empty.asar', 'file1')
+        fs.readFile(p, 'utf8', function (err, content) {
+          assert.equal(err, null)
+          assert.equal(content, '')
+          done()
+        })
+      })
+
       it('reads a linked file', function (done) {
         var p = path.join(fixtures, 'asar', 'a.asar', 'link1')
         fs.readFile(p, function (err, content) {