Fix #855 - ArgumentOutOfRangeException in TransformCollectionAndObjec…

…tInitializers.DoTransform
icsharpcode · Sep 19, 2017 · f267a78 · f267a78
1 parent 8285d01
commit f267a78
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Correctness/InitializerTests.cs b/ICSharpCode.Decompiler.Tests/TestCases/Correctness/InitializerTests.cs
@@ -1015,5 +1015,35 @@ public static void Bug270_NestedInitialisers()
 			}
 		};
 		}
+
+		class Issue855
+		{
+			class Data
+			{
+				public object Obj;
+			}
+
+			class Items
+			{
+				public void SetItem(int i, object item) { }
+			}
+
+			object Item(string s, Data d)
+			{
+				return new object();
+			}
+
+			void Test()
+			{
+				Items items = null;
+
+				int num = 0;
+
+				for (int i = 0; i < 2; i++) {
+					if (num < 10)
+						items.SetItem(num, Item(string.Empty, new Data { Obj = null }));
+				}
+			}
+		}
 	}
 }
diff --git a/ICSharpCode.Decompiler/IL/Transforms/LockTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/LockTransform.cs
@@ -22,7 +22,7 @@ void IBlockTransform.Run(Block block, BlockTransformContext context)
 				// This happens in some cases:
 				// Use correct index after transformation.
 				if (i >= block.Instructions.Count)
-					i = block.Instructions.Count - 1;
+					i = block.Instructions.Count;
 			}
 		}
 

diff --git a/ICSharpCode.Decompiler/IL/Transforms/TransformCollectionAndObjectInitializers.cs b/ICSharpCode.Decompiler/IL/Transforms/TransformCollectionAndObjectInitializers.cs
@@ -36,6 +36,10 @@ void IBlockTransform.Run(Block block, BlockTransformContext context)
 			for (int i = block.Instructions.Count - 1; i >= 0; i--)
 			{
 				DoTransform(block, i);
+				// This happens in some cases:
+				// Use correct index after transformation.
+				if (i >= block.Instructions.Count)
+					i = block.Instructions.Count;
 			}
 		}