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

Preserve tokens if VM code couldn't be restored

Browse Source
This commit is contained in:
de4dot 2012-12-14 16:51:21 +01:00
parent e8a9c0675a
commit 6ce3b44de6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
de4dot.code/deobfuscators/Agile_NET/Deobfuscator.cs
View File

@ -271,8 +271,12 @@ namespace de4dot.code.deobfuscators.Agile_NET {
} }
if (options.RestoreVmCode) { if (options.RestoreVmCode) {
csvm.restore(); if (csvm.restore())
addResourceToBeRemoved(csvm.Resource, "CSVM data resource"); addResourceToBeRemoved(csvm.Resource, "CSVM data resource");
else {
Logger.e("Couldn't restore VM methods");
preserveTokensAndTypes();
}
} }
} }

8
de4dot.code/deobfuscators/Agile_NET/vm/Csvm.cs
View File

@ -78,13 +78,17 @@ namespace de4dot.code.deobfuscators.Agile_NET.vm {
return DotNetUtils.getResource(module, "_CSVM") as EmbeddedResource; return DotNetUtils.getResource(module, "_CSVM") as EmbeddedResource;
} }
public void restore() { public bool restore() {
if (!Detected) if (!Detected)
return; return true;
int oldIndent = Logger.Instance.IndentLevel; int oldIndent = Logger.Instance.IndentLevel;
try { try {
restore2(); restore2();
return true;
}
catch {
return false;
} }
finally { finally {
Logger.Instance.IndentLevel = oldIndent; Logger.Instance.IndentLevel = oldIndent;