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

Fix custom attribute parsing when a null array is used and when an assembly has no attributes

Browse Source
This commit is contained in:
LukeFZ
2023-12-07 20:52:06 +01:00
parent 5b1d9c67d1
commit 1d2890961c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Il2CppInspector.Common/Reflection/TypeModel.cs
View File

@@ -270,6 +270,7 @@ namespace Il2CppInspector.Reflection
var fqn = t switch var fqn = t switch
{ {
Il2CppTypeEnum.IL2CPP_TYPE_IL2CPP_TYPE_INDEX => "System.Type", Il2CppTypeEnum.IL2CPP_TYPE_IL2CPP_TYPE_INDEX => "System.Type",
Il2CppTypeEnum.IL2CPP_TYPE_SZARRAY => "System.Array",
_ => (int) t >= Il2CppConstants.FullNameTypeString.Count _ => (int) t >= Il2CppConstants.FullNameTypeString.Count
? null ? null
: Il2CppConstants.FullNameTypeString[(int) t] : Il2CppConstants.FullNameTypeString[(int) t]
@@ -322,7 +323,8 @@ namespace Il2CppInspector.Reflection
// From v24.1 onwards, token was added to Il2CppCustomAttributeTypeRange and each Il2CppImageDefinition noted the CustomAttributeTypeRanges for the image // From v24.1 onwards, token was added to Il2CppCustomAttributeTypeRange and each Il2CppImageDefinition noted the CustomAttributeTypeRanges for the image
// v29 uses this same system but with CustomAttributeDataRanges instead // v29 uses this same system but with CustomAttributeDataRanges instead
if (!Package.AttributeIndicesByToken[asm.ImageDefinition.customAttributeStart].TryGetValue((uint)token, out var index)) if (!Package.AttributeIndicesByToken.TryGetValue(asm.ImageDefinition.customAttributeStart, out var indices)
|| !indices.TryGetValue((uint)token, out var index))
return -1; return -1;
return index; return index;