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

Don't crash on 64-bit Flags enums with top bit set (#131)

Browse Source
This commit is contained in:
Katy Coe
2021-01-28 20:21:20 +01:00
parent 3a9a190530
commit 4d6686a063
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Il2CppInspector.Common/Reflection/Extensions.cs
View File

@@ -6,6 +6,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@@ -151,9 +152,22 @@ namespace Il2CppInspector.Reflection
} }
// Logical OR a series of flags together // Logical OR a series of flags together
var flagValue = Convert.ToInt64(value);
var setFlags = values.Where(x => (Convert.ToInt64(x.Value) & flagValue) == Convert.ToInt64(x.Value)).Select(x => typeName + "." + x.Key); // Values like 0x8000_0000_0000_0000 can't be cast to Int64
return string.Join(" | ", setFlags); // but values like 0xffff_ffff can't be cast to UInt64 (due to sign extension)
// so we're just going to have to try to find a type that doesn't make it explode
if (value is byte || value is ushort || value is uint || value is ulong) {
var flagValue = Convert.ToUInt64(value);
var setFlags = values.Where(x => (Convert.ToUInt64(x.Value) & flagValue) == Convert.ToUInt64(x.Value)).Select(x => typeName + "." + x.Key);
return string.Join(" | ", setFlags);
}
else if (value is sbyte || value is short || value is int || value is long) {
var flagValue = Convert.ToInt64(value);
var setFlags = values.Where(x => (Convert.ToInt64(x.Value) & flagValue) == Convert.ToInt64(x.Value)).Select(x => typeName + "." + x.Key);
return string.Join(" | ", setFlags);
} else {
throw new ArgumentException("Unsupported enum underlying type");
}
} }
// Structs and generic type parameters must use 'default' rather than 'null' // Structs and generic type parameters must use 'default' rather than 'null'
return value?.ToString() ?? (type.IsValueType || type.IsGenericParameter? "default" : "null"); return value?.ToString() ?? (type.IsValueType || type.IsGenericParameter? "default" : "null");