From f2a9118bf5bda07655afb0655b16ef138d5196ca Mon Sep 17 00:00:00 2001 From: de4dot Date: Fri, 15 Nov 2013 19:30:11 +0100 Subject: [PATCH] Fix merges --- de4dot.blocks/cflow/InstructionEmulator.cs | 4 ++-- de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/de4dot.blocks/cflow/InstructionEmulator.cs b/de4dot.blocks/cflow/InstructionEmulator.cs index 450eca08..a829d02a 100644 --- a/de4dot.blocks/cflow/InstructionEmulator.cs +++ b/de4dot.blocks/cflow/InstructionEmulator.cs @@ -114,10 +114,10 @@ namespace de4dot.blocks.cflow { case ElementType.U2: case ElementType.I4: case ElementType.U4: - return Int32Value.zero; + return Int32Value.Zero; case ElementType.I8: case ElementType.U8: - return Int64Value.zero; + return Int64Value.Zero; } return new UnknownValue(); } diff --git a/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs b/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs index a03df11b..a4620bbb 100644 --- a/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs +++ b/de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs @@ -707,8 +707,8 @@ done: ; var ctorArg = emu.Pop() as Int32Value; if (ctorArg == null || !ctorArg.AllBitsValid()) return false; - dynocode.CreateEnumerable(ctor, new object[] { ctorArg.value }); - dynocode.WriteEnumerableField(enumerableField.MDToken.ToUInt32(), initValue.value); + dynocode.CreateEnumerable(ctor, new object[] { ctorArg.Value }); + dynocode.WriteEnumerableField(enumerableField.MDToken.ToUInt32(), initValue.Value); dynocode.CreateEnumerator(); foreach (var val in dynocode) { emu.Push(new Int32Value(val));