ELF: Fix DT_INIT from GetFunctionTable() wasn't mapped to file offset

This commit is contained in:
Katy Coe
2020-02-14 15:11:29 +01:00
parent 164535ad6a
commit ee93343ff8

View File

@@ -341,13 +341,13 @@ namespace Il2CppInspector
var init = MapVATR(conv.ULong(getDynamic(Elf.DT_INIT_ARRAY).d_un));
var size = getDynamic(Elf.DT_INIT_ARRAYSZ).d_un;
var init_array = conv.UIntArray(ReadArray<TWord>(init, conv.Int(size) / (Bits / 8))).Select(x => MapVATR(x));
var init_array = conv.UIntArray(ReadArray<TWord>(init, conv.Int(size) / (Bits / 8)));
// Additionally, check if there is an old-style DT_INIT function and include it in the list if so
if (getDynamic(Elf.DT_INIT) != null)
init_array = init_array.Concat(conv.UIntArray(new[] {getDynamic(Elf.DT_INIT).d_un}));
init_array = init_array.Concat(conv.UIntArray(new[] { getDynamic(Elf.DT_INIT).d_un })).ToArray();
return init_array.ToArray();
return init_array.Select(x => MapVATR(x)).ToArray();
}
// Map a virtual address to an offset into the image file. Throws an exception if the virtual address is not mapped into the file.