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

Add fallback to invalid compressed int in BlobReader

Browse Source
This commit is contained in:
LukeFZ
2024-02-25 15:24:09 +01:00
parent e328ed9b84
commit eababc31f3
1 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Il2CppInspector.Common/Utils/BlobReader.cs
View File

@@ -2,6 +2,7 @@
using System.Text; using System.Text;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
namespace Il2CppInspector.Utils; namespace Il2CppInspector.Utils;
@@ -33,14 +34,10 @@ public static class BlobReader
value = blob.ReadInt16(); value = blob.ReadInt16();
break; break;
case Il2CppTypeEnum.IL2CPP_TYPE_U4: case Il2CppTypeEnum.IL2CPP_TYPE_U4:
value = blob.Version >= 29 value = ReadUInt32();
? blob.ReadCompressedUInt32()
: blob.ReadUInt32();
break; break;
case Il2CppTypeEnum.IL2CPP_TYPE_I4: case Il2CppTypeEnum.IL2CPP_TYPE_I4:
value = blob.Version >= 29 value = ReadInt32();
? blob.ReadCompressedInt32()
: blob.ReadInt32();
break; break;
case Il2CppTypeEnum.IL2CPP_TYPE_U8: case Il2CppTypeEnum.IL2CPP_TYPE_U8:
value = blob.ReadUInt64(); value = blob.ReadUInt64();
@@ -55,19 +52,13 @@ public static class BlobReader
value = blob.ReadDouble(); value = blob.ReadDouble();
break; break;
case Il2CppTypeEnum.IL2CPP_TYPE_STRING: case Il2CppTypeEnum.IL2CPP_TYPE_STRING:
var uiLen = blob.Version >= 29 var uiLen = ReadInt32();
? blob.ReadCompressedInt32()
: blob.ReadInt32();
if (uiLen != -1) if (uiLen != -1)
value = Encoding.UTF8.GetString(blob.ReadBytes(uiLen)); value = Encoding.UTF8.GetString(blob.ReadBytes(uiLen));
break; break;
case Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY: case Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY:
var length = blob.Version >= 29 var length = ReadInt32();
? blob.ReadCompressedInt32()
: blob.ReadInt32();
if (length == -1) if (length == -1)
break; break;
@@ -117,6 +108,46 @@ public static class BlobReader
} }
return value; return value;
int ReadInt32()
{
if (blob.Version >= 29)
{
var address = blob.Position;
try
{
return blob.ReadCompressedInt32();
}
catch (InvalidDataException)
{
Console.WriteLine($"Found invalid compressed int at metadata address 0x{address:x8}. Reading as normal int.");
return blob.ReadInt32(address);
}
}
return blob.ReadInt32();
}
uint ReadUInt32()
{
if (blob.Version >= 29)
{
var address = blob.Position;
try
{
return blob.ReadCompressedUInt32();
}
catch (InvalidDataException)
{
Console.WriteLine($"Found invalid compressed uint at metadata address 0x{address:x8}. Reading as normal uint.");
return blob.ReadUInt32(address);
}
}
return blob.ReadUInt32();
}
} }
public static Il2CppTypeEnum ReadEncodedTypeEnum(Il2CppInspector inspector, BinaryObjectStream blob, public static Il2CppTypeEnum ReadEncodedTypeEnum(Il2CppInspector inspector, BinaryObjectStream blob,