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

IL2CPP: Fix regression in buildLateBindingMetadataUsages() (v27)

Browse Source
This commit is contained in:
Katy Coe
2020-12-21 06:38:09 +01:00
parent 7141d7759a
commit 70d0795c44
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Il2CppInspector.Common/IL2CPP/Il2CppInspector.cs
View File

@@ -173,7 +173,8 @@ namespace Il2CppInspector
var words = BinaryImage.ReadArray<ulong>(0, (int) BinaryImage.Length / (BinaryImage.Bits / 8)); var words = BinaryImage.ReadArray<ulong>(0, (int) BinaryImage.Length / (BinaryImage.Bits / 8));
// Scan the image looking for a sequential block of at least 'threshold' valid metadata tokens // Scan the image looking for a sequential block of at least 'threshold' valid metadata tokens
for (var pos = 0; pos < words.Length && (usagesCount == 0 || sequenceLength > 0); pos++) { int pos;
for (pos = 0; pos < words.Length && (usagesCount == 0 || sequenceLength > 0); pos++) {
var word = words[pos]; var word = words[pos];
if (word % 2 != 1 || word >> 32 != 0) { if (word % 2 != 1 || word >> 32 != 0) {
@@ -203,7 +204,7 @@ namespace Il2CppInspector
// If we found a block, read all the tokens and map them with their VAs to MetadataUsage objects // If we found a block, read all the tokens and map them with their VAs to MetadataUsage objects
if (usagesCount > 0) { if (usagesCount > 0) {
var wordSize = BinaryImage.Bits / 8; var wordSize = BinaryImage.Bits / 8;
var pMetadataUsages = (uint) (BinaryImage.Position - (usagesCount + 1) * wordSize); var pMetadataUsages = (uint) (pos * wordSize - (usagesCount + 1) * wordSize);
var pMetadataUsagesVA = BinaryImage.MapFileOffsetToVA(pMetadataUsages); var pMetadataUsagesVA = BinaryImage.MapFileOffsetToVA(pMetadataUsages);
var usageTokens = BinaryImage.ReadWordArray(pMetadataUsages, usagesCount); var usageTokens = BinaryImage.ReadWordArray(pMetadataUsages, usagesCount);
var usages = usageTokens.Zip(Enumerable.Range(0, usagesCount) var usages = usageTokens.Zip(Enumerable.Range(0, usagesCount)