8000 Fixed reading of "small" methods by krystiankolodziej · Pull Request #35 · preemptive/PPiOS-Rename · GitHub
[go: up one dir, main page]
Skip to content

Fixed reading of "small" methods #35

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

Merged
1 commit merged into from
Sep 24, 2021
Merged

Fixed reading of "small" methods #35

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions Source/CDLCSegment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ extern NSString *CDSegmentEncryptionTypeName(CDSegmentEncryptionType type);
- (NSString *)flagDescription;

- (BOOL)containsAddress:(NSUInteger)address;
- (BOOL)containsOffset:(NSUInteger)address;
- (CDSection *)sectionContainingAddress:(NSUInteger)address;
- (CDSection *)sectionWithName:(NSString *)name;
- (NSUInteger)fileOffsetForAddress:(NSUInteger)address;
- (NSUInteger)segmentOffsetForAddress:(NSUInteger)address;
- (NSUInteger)addressForDataOffset:(NSUInteger)offset;

- (void)writeSectionData;

Expand Down
15 changes: 15 additions & 0 deletions Source/CDLCSegment.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ - (NSUInteger)vmaddr;
return _segmentCommand.vmaddr;
}

- (NSUInteger)vmsize;
{
return _segmentCommand.vmsize;
}

- (NSUInteger)fileoff;
{
return _segmentCommand.fileoff;
Expand Down Expand Up @@ -169,6 +174,11 @@ - (BOOL)containsAddress:(NSUInteger)address;
return (address >= _segmentCommand.vmaddr) && (address < _segmentCommand.vmaddr + _segmentCommand.vmsize);
}

- (BOOL)containsOffset:(NSUInteger)address
{
return (address >= _segmentCommand.fileoff) && (address < _segmentCommand.fileoff + _segmentCommand.filesize);
}

- (CDSection *)sectionContainingAddress:(NSUInteger)address;
{
for (CDSection *section in self.sections) {
Expand All @@ -194,6 +204,11 @@ - (NSUInteger)fileOffsetForAddress:(NSUInteger)address;
return [[self sectionContainingAddress:address] fileOffsetForAddress:address];
}

- (NSUInteger)addressForDataOffset:(NSUInteger)offset
{
return self.vmaddr + (offset - self.fileoff);
}

- (NSUInteger)segmentOffsetForAddress:(NSUInteger)address;
{
return [self fileOffsetForAddress:address] - self.fileoff;
Expand Down
1 change: 1 addition & 0 deletions Source/CDMachOFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ typedef enum : NSUInteger {
- (NSString *)stringAtAddress:(NSUInteger)address;

- (NSUInteger)dataOffsetForAddress:(NSUInteger)address;
- (NSUInteger)addressForDataOffset:(NSUInteger)offset;

- (const void *)bytes;
- (const void *)bytesAtOffset:(NSUInteger)offset;
Expand Down
33 changes: 32 additions & 1 deletion Source/CDMachOFile.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,17 @@ - (CDLCSegment *)segmentContainingAddress:(NSUInteger)address;
return nil;
}

- (CDLCSegment *)segmentContainingOffset:(NSUInteger)offset;
{
for (id loadCommand in _loadCommands) {
if ([loadCommand isKindOfClass:[CDLCSegment class]] && [loadCommand containsOffset:offset]) {
return loadCommand;
}
}

return nil;
}

- (void)showWarning:(NSString *)warning;
{
NSLog(@"Warning: %@", warning);
Expand Down Expand Up @@ -356,7 +367,8 @@ - (NSString *)stringAtAddress:(NSUInteger)address;
CDSection *section = [segment sectionContainingAddress:address];
if ([[section sectionName] isEqualToString:@"__objc_selrefs"]) {
const void * reference = [self.data bytes] + offset;
offset = ([self ptrSize] == 8) ? *((uint64_t *)reference) : *((uint32_t *)reference);
NSUInteger vmaddr = ([self ptrSize] == 8) ? *((uint64_t *)reference) : *((uint32_t *)reference);
offset = [self dataOffsetForAddress:vmaddr];
}

ptr = (uint8_t *)[self.data bytes] + offset;
Expand All @@ -383,6 +395,25 @@ - (NSUInteger)dataOffsetForAddress:(NSUInteger)address;
return [segment fileOffsetForAddress:address];
}

- (NSUInteger)addressForDataOffset:(NSUInteger)offset
{
if (offset == 0)
return 0;

CDLCSegment *segment = [self segmentContainingOffset:offset];
if (segment == nil) {
NSLog(@"Error: Cannot find segment for data offset 0x%08lx in segmentContainingOffset:", offset);
exit(5);
}

if ([segment isProtected]) {
NSLog(@"Error: Segment is protected.");
exit(5);
}

return [segment addressForDataOffset:offset];
}

- (const void *)bytes;
{
return [self.data bytes];
Expand Down
6 changes: 6 additions & 0 deletions Source/CDObjectiveC2Processor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,12 @@ - (NSArray *)loadMethodsAtAddress:(uint64_t)address extendedMethodTypesCursor:(C
objc2Method.name = [cursor readPtr:small];
objc2Method.types = [cursor readPtr:small];
objc2Method.imp = [cursor readPtr:small];

if (small) {
objc2Method.name = [self.machOFile addressForDataOffset:objc2Method.name];
objc2Method.types = [self.machOFile addressForDataOffset:objc2Method.types];
}

NSString *name = [self.machOFile stringAtAddress:objc2Method.name];
NSString *types = [self.machOFile stringAtAddress:objc2Method.types];

Expand Down
0