diff --git a/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs b/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs index cb6f9f12..21f2ca5f 100644 --- a/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs +++ b/de4dot.code/deobfuscators/Babel_NET/ConstantsDecrypter.cs @@ -138,6 +138,9 @@ namespace de4dot.code.deobfuscators.Babel_NET { } public void initialize(ISimpleDeobfuscator simpleDeobfuscator, IDeobfuscator deob) { + if (decrypterType == null) + return; + encryptedResource = findEncryptedResource(simpleDeobfuscator, deob); if (encryptedResource == null) { Log.w("Could not find encrypted constants resource"); diff --git a/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs b/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs index f999873f..4bd31fee 100644 --- a/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs +++ b/de4dot.code/deobfuscators/Babel_NET/ImageReader.cs @@ -251,7 +251,7 @@ namespace de4dot.code.deobfuscators.Babel_NET { if (type.IsGenericInstance) type = ((GenericInstanceType)type).ElementType; - if (type.Scope == module) + if (type.Module == module && isModuleAssembly(type.Scope)) return DotNetUtils.getType(module, type); return externalAssemblies.resolve(type);