Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: arm64/x64 inputs may contain universal binaries that are not the same #62

Merged
merged 3 commits into from
Jun 25, 2023
Merged

fix: arm64/x64 inputs may contain universal binaries that are not the same #62

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1550352
Mach-O types are in big endian format
koush Jan 31, 2023
20a89f6
Update asar-utils.ts
koush Jan 31, 2023
487424b
Update asar-utils.ts
koush Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/asar-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ const MACHO_MAGIC = new Set([
0xcffaedfe,
]);

const MACHO_UNIVERSAL_MAGIC = new Set([
// universal
0xcafebabe,
0xbebafeca,
]);

export const detectAsarMode = async (appPath: string) => {
d('checking asar mode of', appPath);
const asarPath = path.resolve(appPath, 'Contents', 'Resources', 'app.asar');
Expand Down Expand Up @@ -147,6 +153,10 @@ export const mergeASARs = async ({
continue;
}

if (MACHO_UNIVERSAL_MAGIC.has(x64Content.readUInt32LE(0)) && MACHO_UNIVERSAL_MAGIC.has(arm64Content.readUInt32LE(0))) {
continue;
}

if (!MACHO_MAGIC.has(x64Content.readUInt32LE(0))) {
throw new Error(`Can't reconcile two non-macho files ${file}`);
}
Expand Down