monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use DNR hack if methods have same declaring type

Browse Source
This commit is contained in:
de4dot 2011-10-21 21:47:06 +02:00
parent 88f7a31ff1
commit 603fa74ceb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blocks/cflow/BlockCflowDeobfuscator.cs
View File

@ -23,10 +23,12 @@ using Mono.Cecil.Cil;
namespace de4dot.blocks.cflow {
class BlockCflowDeobfuscator {
Blocks blocks;
Block block;
InstructionEmulator instructionEmulator = new InstructionEmulator();
public void init(Blocks blocks, Block block) {
this.blocks = blocks;
this.block = block;
instructionEmulator.init(blocks.Method.HasThis, false, blocks.Method.Parameters, blocks.Locals);
}
@ -100,6 +102,10 @@ namespace de4dot.blocks.cflow {
ldci4 = (Instruction)ldci4.Operand;
if (ldci4 == null || !DotNetUtils.isLdcI4(ldci4) || ldci4.Next == null || ldci4.Next.OpCode.Code != Code.Ret)
return false;
if (!MemberReferenceHelper.compareTypes(method.DeclaringType, blocks.Method.DeclaringType))
return false;
int val = DotNetUtils.getLdcI4Value(ldci4);
block.Instructions[instrIndex] = new Instr(Instruction.Create(OpCodes.Ldc_I4, val));
return true;