Skip to content

.NET Reactor: Fix CflowConstantsInliner corrupting exception handlers #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GarethWright wants to merge 1 commit into from
+11 −3
Closed

.NET Reactor: Fix CflowConstantsInliner corrupting exception handlers #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions de4dot.code/deobfuscators/dotNET_Reactor/v4/CflowConstantsInliner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,17 @@ public void InlineAllConstants() {
if (load.Operand is not FieldDef loadField)
continue;
if (dictionary.TryGetValue(loadField, out var value)) {
instrs[i] = Instruction.CreateLdcI4(value);
if (nopNext)
instrs[i + 1] = Instruction.Create(OpCodes.Nop);
// Mutate in place instead of replacing the instruction objects: the original
// ldsfld/ldfld may be an exception-handler boundary or branch target, and
// swapping in a new Instruction would leave those references dangling (which
// later crashes InstructionListParser when it rebuilds the method's blocks).
var ldc = Instruction.CreateLdcI4(value);
instrs[i].OpCode = ldc.OpCode;
instrs[i].Operand = ldc.Operand;
if (nopNext) {
instrs[i + 1].OpCode = OpCodes.Nop;
instrs[i + 1].Operand = null;
}
}
}
}
Expand Down