From 2c33d80cccf7410ee5e1165c67d65382024103aa Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Fri, 3 Aug 2012 20:15:13 +0200
Subject: [PATCH] Support netmodules

---
 de4dot.code/deobfuscators/Confuser/Deobfuscator.cs      | 2 +-
 de4dot.code/deobfuscators/Confuser/ProxyCallFixerV10.cs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs b/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
index 6a1cb128..9f6fca01 100644
--- a/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
@@ -328,7 +328,7 @@ namespace de4dot.code.deobfuscators.Confuser {
 				addResourceToBeRemoved(mainAsmInfo.resource, string.Format("Embedded assembly: {0}", mainAsmInfo.asmFullName));
 			}
 			foreach (var info in embeddedAssemblyInfos) {
-				if (info.asmFullName != module.Assembly.Name.FullName)
+				if (module.Assembly == null || info.asmFullName != module.Assembly.Name.FullName)
 					DeobfuscatedFile.createAssemblyFile(info.data, info.asmSimpleName, info.extension);
 				addResourceToBeRemoved(info.resource, string.Format("Embedded assembly: {0}", info.asmFullName));
 			}
diff --git a/de4dot.code/deobfuscators/Confuser/ProxyCallFixerV10.cs b/de4dot.code/deobfuscators/Confuser/ProxyCallFixerV10.cs
index 6731fb16..194a57b0 100644
--- a/de4dot.code/deobfuscators/Confuser/ProxyCallFixerV10.cs
+++ b/de4dot.code/deobfuscators/Confuser/ProxyCallFixerV10.cs
@@ -119,7 +119,10 @@ namespace de4dot.code.deobfuscators.Confuser {
 
 		public ProxyCallFixerV10(ModuleDefinition module)
 			: base(module) {
-			ourAsm = (module.Assembly.Name ?? new AssemblyNameReference(" -1-1-1-1-1- ", new Version(1, 2, 3, 4))).FullName;
+			if (module.Assembly == null || module.Assembly.Name == null)
+				ourAsm = new AssemblyNameReference(" -1-1-1-1-1- ", new Version(1, 2, 3, 4)).FullName;
+			else
+				ourAsm = module.Assembly.FullName;
 		}
 
 		protected override object checkCctor(TypeDefinition type, MethodDefinition cctor) {