Skip to content

Fix ignored error code #11

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

Open
ViRb3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ignored error code #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 3 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ decrypt_macho(const char *inputFile, const char *outputFile)
DLOG("copying original data of size 0x%zx...", base_size);
memcpy(dupe, base, base_size);

int ret = 0;
if (*(uint32_t *)base == FAT_CIGAM || *(uint32_t *)base == FAT_MAGIC) {
bool isBe = *(uint32_t *)base == FAT_CIGAM;
struct fat_header *fat_header = (struct fat_header *) base;
Expand All @@ -323,14 +324,17 @@ decrypt_macho(const char *inputFile, const char *outputFile)
auto curFatArch = &fatarches[fat_i];
DLOG(" handling fat arch %d, cpuType 0x%x, cpuSubType 0x%x, fileOff 0x%x, size 0x%x, align 0x%x", fat_i,
fatInt(curFatArch->cputype), fatInt(curFatArch->cpusubtype), fatInt(curFatArch->offset), fatInt(curFatArch->size), fatInt(curFatArch->align));
decrypt_macho_slide(f, base + fatInt(curFatArch->offset), dupe + fatInt(curFatArch->offset), fatInt(curFatArch->offset));
ret = decrypt_macho_slide(f, base + fatInt(curFatArch->offset), dupe + fatInt(curFatArch->offset), fatInt(curFatArch->offset));
if (ret) {
break;
}
}
} else {
DLOG(" not fat binary, directly decrypting it!");
decrypt_macho_slide(f, base, dupe, 0);
ret = decrypt_macho_slide(f, base, dupe, 0);
}

munmap(base, base_size);
munmap(dupe, dupe_size);
return 0;
return ret;
}