mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix shifting args in fs.readFile

Browse source
This commit is contained in:
Cheng Zhao 2014-09-28 23:36:12 +08:00
parent 4a485f9819
commit 4d01aa2772
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/common/lib/asar.coffee
View file

@ -135,16 +135,16 @@ fs.readFile = (p, options, callback) ->
[isAsar, asarPath, filePath] = splitPath p [isAsar, asarPath, filePath] = splitPath p
return readFile.apply this, arguments unless isAsar return readFile.apply this, arguments unless isAsar
if typeof options is 'function'
callback = options
options = undefined
archive = getOrCreateArchive asarPath archive = getOrCreateArchive asarPath
return callback throw new Error("Invalid package #{asarPath}") unless archive return callback throw new Error("Invalid package #{asarPath}") unless archive
info = archive.getFileInfo filePath info = archive.getFileInfo filePath
return callback createNotFoundError(asarPath, filePath) unless info return callback createNotFoundError(asarPath, filePath) unless info
if typeof options is 'function'
callback = options
options = undefined
if not options if not options
options = encoding: null, flag: 'r' options = encoding: null, flag: 'r'
else if util.isString options else if util.isString options