.NET Reactor: Fix detection of ldtoken virtual opcode in some cases

meck-gd · meck-gd · commit 1723a40ba847 · 2026-04-22T11:13:45.000+02:00
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/vm/PatternMatcher.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/vm/PatternMatcher.cs
@@ -110,6 +110,7 @@ private static bool CanInterchange(Instruction ins, OpCode patOpCode)
 
 		return (ins.IsLdloc() && patIns.IsLdloc())
 			|| (ins.IsStloc() && patIns.IsStloc())
-			|| (ins.IsConditionalBranch() && patOpCode.Name.Replace(".s", "") == ins.OpCode.Name.Replace(".s", ""));
+			|| (ins.IsConditionalBranch() && patOpCode.Name.Replace(".s", "") == ins.OpCode.Name.Replace(".s", ""))
+			|| (ins.OpCode.Code is Code.Leave or Code.Leave_S && patOpCode.Code is Code.Leave or Code.Leave_S);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ private static bool CanInterchange(Instruction ins, OpCode patOpCode)`
`110`	`110`
`111`	`111`	`return (ins.IsLdloc() && patIns.IsLdloc())`
`112`	`112`	`\|\| (ins.IsStloc() && patIns.IsStloc())`
`113`		`- \|\| (ins.IsConditionalBranch() && patOpCode.Name.Replace(".s", "") == ins.OpCode.Name.Replace(".s", ""));`
	`113`	`+ \|\| (ins.IsConditionalBranch() && patOpCode.Name.Replace(".s", "") == ins.OpCode.Name.Replace(".s", ""))`
	`114`	`+ \|\| (ins.OpCode.Code is Code.Leave or Code.Leave_S && patOpCode.Code is Code.Leave or Code.Leave_S);`
`114`	`115`	`}`
`115`	`116`	`}`