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

Print warning if we failed to restore an instr op

Browse Source
This commit is contained in:
de4dot 2012-04-06 12:33:39 +02:00
parent c39e421010
commit 2949862614
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
de4dot.code/deobfuscators/CliSecure/vm/CilOperandInstructionRestorer.cs
View File

@ -30,13 +30,12 @@ namespace de4dot.code.deobfuscators.CliSecure.vm {
class CilOperandInstructionRestorer {
MethodDefinition method;
// Returns true if something was restored
public bool restore(MethodDefinition method) {
this.method = method;
bool changed = false;
bool atLeastOneFailed = false;
if (method == null || method.Body == null)
return changed;
return atLeastOneFailed;
var instrs = method.Body.Instructions;
for (int i = 0; i < instrs.Count; i++) {
@ -66,14 +65,15 @@ namespace de4dot.code.deobfuscators.CliSecure.vm {
default:
continue;
}
if (!isValidType(operandType))
if (!isValidType(operandType)) {
atLeastOneFailed = true;
continue;
}
instr.Operand = operandType;
changed = true;
}
return changed;
return atLeastOneFailed;
}
bool isValidType(TypeReference type) {

3
de4dot.code/deobfuscators/CliSecure/vm/CsvmToCilMethodConverter.cs
View File

@ -49,7 +49,8 @@ namespace de4dot.code.deobfuscators.CliSecure.vm {
DotNetUtils.restoreBody(cilMethod, newInstructions, newExceptions);
operandRestorer.restore(cilMethod);
if (operandRestorer.restore(cilMethod))
Log.w("Failed to restore one or more instruction operands in CSVM method {0:X8}", cilMethod.MetadataToken.ToInt32());
}
void fixLocals(IList<Instruction> instrs, IList<VariableDefinition> locals) {