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

fix: internalModuleReadJSON for unpacked JSON (#26749)

Browse source
This commit is contained in:
Vadim 2020-12-02 11:33:39 +06:00 • committed by GitHub
parent c2909a3b8d
commit efca7007b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/asar/fs-wrapper.ts
View file

@ -689,7 +689,8 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
if (info.size === 0) return ['', false]; if (info.size === 0) return ['', false];
if (info.unpacked) { if (info.unpacked) {
const realPath = archive.copyFileOut(filePath); const realPath = archive.copyFileOut(filePath);
return fs.readFileSync(realPath, { encoding: 'utf8' }); const str = fs.readFileSync(realPath, { encoding: 'utf8' });
return [str, str.length > 0];
} }
logASARAccess(asarPath, filePath, info.offset); logASARAccess(asarPath, filePath, info.offset);

3
spec/asar-spec.js
View file

@ -1444,7 +1444,8 @@ describe('asar package', function () {
it('reads a normal file with unpacked files', function () { it('reads a normal file with unpacked files', function () {
const p = path.join(asarDir, 'unpack.asar', 'a.txt'); const p = path.join(asarDir, 'unpack.asar', 'a.txt');
expect(internalModuleReadJSON(p).toString().trim()).to.equal('a'); const [s, c] = internalModuleReadJSON(p);
expect([s.toString().trim(), c]).to.eql(['a', true]);
}); });
}); });