Fix null check in MatchLegacySwitchOnStringWithDict

ds5678 · ds5678 · commit cbe8dd43d75a · 2025-03-09T21:00:36.000-07:00
Updated the condition for `nullValueCaseBlock` to ensure it is not null and not equal to `defaultBlock`.
diff --git a/ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/SwitchOnStringTransform.cs
@@ -668,7 +668,7 @@ bool MatchLegacySwitchOnStringWithDict(InstructionCollection<ILInstruction> inst
 			if (!FixCasesWithoutValue(sections, stringValues))
 				return false;
 			// switch contains case null:
-			if (nullValueCaseBlock != defaultBlock)
+			if (nullValueCaseBlock != null && nullValueCaseBlock != defaultBlock)
 			{
 				if (!AddNullSection(sections, stringValues, nullValueCaseBlock))
 				{

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ bool MatchLegacySwitchOnStringWithDict(InstructionCollection<ILInstruction> inst`
`668`	`668`	`if (!FixCasesWithoutValue(sections, stringValues))`
`669`	`669`	`return false;`
`670`	`670`	`// switch contains case null:`
`671`		`- if (nullValueCaseBlock != defaultBlock)`
	`671`	`+ if (nullValueCaseBlock != null && nullValueCaseBlock != defaultBlock)`
`672`	`672`	`{`
`673`	`673`	`if (!AddNullSection(sections, stringValues, nullValueCaseBlock))`
`674`	`674`	`{`