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 NSRangeException when removing load command #20

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

Fix NSRangeException when removing load command #20

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
7 changes: 7 additions & 0 deletions optool/operations.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,13 @@ BOOL removeLoadEntryFromBinary(NSMutableData *binary, struct thin_header macho,
case LC_LOAD_DYLIB: {

struct dylib_command command = *(struct dylib_command *)(binary.bytes + binary.currentOffset);

// validate name's range offset is in binary bounds
if (binary.currentOffset + command.cmdsize > binary.length) {
LOG("Command at offset %lu is out of binary bounds", binary.currentOffset);
break;
}

char *name = (char *)[[binary subdataWithRange:NSMakeRange(binary.currentOffset + command.dylib.name.offset, command.cmdsize - command.dylib.name.offset)] bytes];
if ([@(name) isEqualToString:payload] && removedOrdinal == -1) {
LOG("removing payload from %s...", LC(cmd));
Expand Down