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

Fix merges

Browse Source
This commit is contained in:
de4dot 2013-11-15 19:30:11 +01:00
parent cec4519635
commit f2a9118bf5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
de4dot.blocks/cflow/InstructionEmulator.cs
View File

@ -114,10 +114,10 @@ namespace de4dot.blocks.cflow {
case ElementType.U2: case ElementType.U2:
case ElementType.I4: case ElementType.I4:
case ElementType.U4: case ElementType.U4:
return Int32Value.zero; return Int32Value.Zero;
case ElementType.I8: case ElementType.I8:
case ElementType.U8: case ElementType.U8:
return Int64Value.zero; return Int64Value.Zero;
} }
return new UnknownValue(); return new UnknownValue();
} }

4
de4dot.code/deobfuscators/Eazfuscator_NET/StringDecrypter.cs
View File

@ -707,8 +707,8 @@ done: ;
var ctorArg = emu.Pop() as Int32Value; var ctorArg = emu.Pop() as Int32Value;
if (ctorArg == null || !ctorArg.AllBitsValid()) if (ctorArg == null || !ctorArg.AllBitsValid())
return false; return false;
dynocode.CreateEnumerable(ctor, new object[] { ctorArg.value }); dynocode.CreateEnumerable(ctor, new object[] { ctorArg.Value });
dynocode.WriteEnumerableField(enumerableField.MDToken.ToUInt32(), initValue.value); dynocode.WriteEnumerableField(enumerableField.MDToken.ToUInt32(), initValue.Value);
dynocode.CreateEnumerator(); dynocode.CreateEnumerator();
foreach (var val in dynocode) { foreach (var val in dynocode) {
emu.Push(new Int32Value(val)); emu.Push(new Int32Value(val));