chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MachO: Disallow mapping to BSS and negative size sections

Browse Source
This commit is contained in:
Katy Coe
2020-12-07 00:19:47 +01:00
parent d627cb93df
commit aef7245cd2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Il2CppInspector.Common/FileFormatReaders/MachOReader.cs
View File

@@ -25,7 +25,7 @@ namespace Il2CppInspector
protected override MachO lc_Segment => MachO.LC_SEGMENT; protected override MachO lc_Segment => MachO.LC_SEGMENT;
public override uint MapVATR(ulong uiAddr) { public override uint MapVATR(ulong uiAddr) {
var section = machoSections.First(x => uiAddr >= x.Address && uiAddr <= x.Address + x.Size); var section = machoSections.First(x => uiAddr >= x.Address && uiAddr <= x.Address + x.Size && x.Name != "__bss" && x.Name != "__common");
return (uint) uiAddr - (section.Address - section.ImageOffset); return (uint) uiAddr - (section.Address - section.ImageOffset);
} }
@@ -47,7 +47,7 @@ namespace Il2CppInspector
protected override MachO lc_Segment => MachO.LC_SEGMENT_64; protected override MachO lc_Segment => MachO.LC_SEGMENT_64;
public override uint MapVATR(ulong uiAddr) { public override uint MapVATR(ulong uiAddr) {
var section = machoSections.First(x => uiAddr >= x.Address && uiAddr <= x.Address + x.Size); var section = machoSections.First(x => uiAddr >= x.Address && uiAddr <= x.Address + x.Size && x.Name != "__bss" && x.Name != "__common");
return (uint) (uiAddr - (section.Address - section.ImageOffset)); return (uint) (uiAddr - (section.Address - section.ImageOffset));
} }
@@ -127,9 +127,9 @@ namespace Il2CppInspector
// Create universal section // Create universal section
sections.Add(new Section { sections.Add(new Section {
VirtualStart = conv.ULong(section.Address), VirtualStart = conv.ULong(section.Address),
VirtualEnd = conv.ULong(section.Address) + conv.ULong(section.Size) - 1, VirtualEnd = conv.ULong(section.Address) + (uint) Math.Max(conv.Int(section.Size) - 1, 0),
ImageStart = section.ImageOffset, ImageStart = section.ImageOffset,
ImageEnd = section.ImageOffset + (uint) conv.Int(section.Size) - 1, ImageEnd = section.ImageOffset + (uint) Math.Max(conv.Int(section.Size) - 1, 0),
IsData = segment.Name == "__TEXT" || segment.Name == "__DATA", IsData = segment.Name == "__TEXT" || segment.Name == "__DATA",
IsExec = segment.Name == "__TEXT", IsExec = segment.Name == "__TEXT",