Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ public override void DeobfuscateBegin() {
if (options.DecryptResources) {
resourceResolver.Initialize(DeobfuscatedFile, this);
DecryptResources();
if (options.InlineMethods) {
if (options.InlineMethods && !resourceResolver.HasExternalMethodReferences) {
AddTypeToBeRemoved(resourceResolver.Type, "Resource decrypter type");
removeResourceResolver = true;
}
Expand Down
22 changes: 22 additions & 0 deletions de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,28 @@ MethodDef FindInitMethod(ISimpleDeobfuscator simpleDeobfuscator) {
return null;
}

public bool HasExternalMethodReferences {
get {
if (Type == null)
return false;

foreach (var type in module.GetTypes()) {
if (type == Type)
continue;
foreach (var method in type.Methods) {
if (!method.HasBody)
continue;
foreach (var calledMethod in DotNetUtils.GetCalledMethods(module, method)) {
if (calledMethod.DeclaringType == Type && calledMethod != initMethod)
return true;
}
}
}

return false;
}
}

public EmbeddedResource MergeResources() {
if (encryptedResource.Resource == null)
return null;
Expand Down
Loading