Core.Utils: NewArm64 stop disassembling when an invalid instruction i…

…s hit
ds5678 · Aug 13, 2024 · 3946e73 · 3946e73
1 parent a297189
commit 3946e73
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Cpp2IL.Core/Utils/NewArm64Utils.cs b/Cpp2IL.Core/Utils/NewArm64Utils.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Disarm;
@@ -35,7 +35,7 @@ public static List<Arm64Instruction> GetArm64MethodBodyAtVirtualAddress(ulong vi
         var span = allBytes.AsSpan(pos, 4);
         List<Arm64Instruction> ret = new();
 
-        while ((count == -1 || ret.Count < count) && !ret.Any(i => i.Mnemonic is Arm64Mnemonic.B))
+        while ((count == -1 || ret.Count < count) && !ret.Any(i => i.Mnemonic is Arm64Mnemonic.B || i.Mnemonic is Arm64Mnemonic.INVALID))
         {
             ret = Disassemble(span, virtAddress);