Minimum fix

jbevain · Oct 14, 2020 · 0f23047 · 0f23047
1 parent 8cf9b8c
commit 0f23047
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Mono.Cecil.Cil/MethodBody.cs b/Mono.Cecil.Cil/MethodBody.cs
@@ -401,15 +401,23 @@ InstructionOffset ResolveInstructionOffset(InstructionOffset inputOffset, ref In
 				for (int i = cache.Index; i < items.Length; i++) {
 					cache.Index = i;
 					cache.Offset = size;
-					cache.Instruction = items [i];
+
+					var item = items [i];
+
+					// Allow for trailing null values in the case of
+					// instructions.Size < instructions.Capacity
+					if (item == null)
+						break;
+
+					cache.Instruction = item;
 
 					if (cache.Offset == offset)
 						return new InstructionOffset (cache.Instruction);
 
 					if (cache.Offset > offset)
 						return new InstructionOffset (items [i - 1]);
 
-					size += items [i].GetSize ();
+					size += item.GetSize ();
 				}
 
 				return new InstructionOffset ();