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

Make sure string decrypter methods aren't detected as inlined methods

Browse Source
This commit is contained in:
de4dot 2012-05-03 09:51:26 +02:00
parent 870dab5b90
commit 83dc4226c1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
de4dot.code/deobfuscators/DeepSea/Deobfuscator.cs
View File

@ -268,7 +268,7 @@ done:
void removeInlinedMethods() {
if (!options.InlineMethods || !options.RemoveInlinedMethods)
return;
removeInlinedMethods(DsInlinedMethodsFinder.find(module));
removeInlinedMethods(DsInlinedMethodsFinder.find(module, staticStringInliner.Methods));
}
public override IEnumerable<int> getStringDecrypterMethods() {

8
de4dot.code/deobfuscators/DeepSea/DsInlinedMethodsFinder.cs
View File

@ -22,12 +22,16 @@ using Mono.Cecil;
namespace de4dot.code.deobfuscators.DeepSea {
static class DsInlinedMethodsFinder {
public static List<MethodDefinition> find(ModuleDefinition module) {
public static List<MethodDefinition> find(ModuleDefinition module, IEnumerable<MethodDefinition> notInlinedMethods) {
var notInlinedMethodsDict = new Dictionary<MethodDefinition, bool>();
foreach (var method in notInlinedMethods)
notInlinedMethodsDict[method] = true;
var inlinedMethods = new List<MethodDefinition>();
foreach (var type in module.GetTypes()) {
foreach (var method in type.Methods) {
if (DsMethodCallInliner.canInline(method))
if (!notInlinedMethodsDict.ContainsKey(method) && DsMethodCallInliner.canInline(method))
inlinedMethods.Add(method);
}
}