Fix #3190: NRE in YieldReturnDecompiler

siegfriedpammer · siegfriedpammer · commit 51522c448784 · 2025-03-22T10:14:11.000+01:00
diff --git a/ICSharpCode.Decompiler/IL/ControlFlow/YieldReturnDecompiler.cs b/ICSharpCode.Decompiler/IL/ControlFlow/YieldReturnDecompiler.cs
@@ -1014,7 +1014,7 @@ void ConvertBranchAfterYieldReturn(Block newBlock, Block oldBlock, int pos)
 				}
 				// We can't use MatchStLoc like above since the doFinallyBodies variable is split by SplitVariables.
 				// This occurs for the Legacy VBC compiler.
-				if (oldBlock.Instructions[pos].MatchStLoc(out var var, out value) && var.Kind == VariableKind.Local && var.Index == doFinallyBodies.Index)
+				if (oldBlock.Instructions[pos].MatchStLoc(out var var, out value) && var.Kind == VariableKind.Local && var.Index == doFinallyBodies?.Index)
 				{
 					if (!value.MatchLdcI4(0))
 					{

Original file line number	Diff line number	Diff line change
`@@ -1014,7 +1014,7 @@ void ConvertBranchAfterYieldReturn(Block newBlock, Block oldBlock, int pos)`
`1014`	`1014`	`}`
`1015`	`1015`	`// We can't use MatchStLoc like above since the doFinallyBodies variable is split by SplitVariables.`
`1016`	`1016`	`// This occurs for the Legacy VBC compiler.`
`1017`		`- if (oldBlock.Instructions[pos].MatchStLoc(out var var, out value) && var.Kind == VariableKind.Local && var.Index == doFinallyBodies.Index)`
	`1017`	`+ if (oldBlock.Instructions[pos].MatchStLoc(out var var, out value) && var.Kind == VariableKind.Local && var.Index == doFinallyBodies?.Index)`
`1018`	`1018`	`{`
`1019`	`1019`	`if (!value.MatchLdcI4(0))`
`1020`	`1020`	`{`