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

Output: Fix crash regression with edge case explicit interface property output

Browse Source
This commit is contained in:
Katy Coe
2020-01-18 22:26:11 +01:00
parent 054b3641ca
commit c144e361c6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Il2CppDumper/Il2CppCSharpDumper.cs
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2017-2019 Katy Coe - http://www.djkaty.com - https://github.com/djkaty // Copyright (c) 2017-2020 Katy Coe - http://www.djkaty.com - https://github.com/djkaty
// All rights reserved // All rights reserved
using System; using System;
@@ -282,7 +282,8 @@ namespace Il2CppInspector
var getAccess = (prop.GetMethod?.Attributes ?? 0) & MethodAttributes.MemberAccessMask; var getAccess = (prop.GetMethod?.Attributes ?? 0) & MethodAttributes.MemberAccessMask;
var setAccess = (prop.SetMethod?.Attributes ?? 0) & MethodAttributes.MemberAccessMask; var setAccess = (prop.SetMethod?.Attributes ?? 0) & MethodAttributes.MemberAccessMask;
var primary = getAccess >= setAccess ? prop.GetMethod : prop.SetMethod; // In case the access level of both is the same and the selected method is null, pick the other one (rare edge case)
var primary = (getAccess >= setAccess ? prop.GetMethod : prop.SetMethod) ?? prop.GetMethod ?? prop.SetMethod;
sb.Append($"{prefix}\t{primary.GetModifierString()}{prop.PropertyType.GetScopedCSharpName(scope)} "); sb.Append($"{prefix}\t{primary.GetModifierString()}{prop.PropertyType.GetScopedCSharpName(scope)} ");
// Non-indexer; non-auto-properties should have a body // Non-indexer; non-auto-properties should have a body