Fix CheckFields of ResourceResolver to fit Dnr5 (de4dot#139)

* fix to support DNR 4.99 and 5.0 * Fix CheckFields to Fit NR5
davliang · Jan 26, 2018 · e8e12f6 · e8e12f6
1 parent bf3a660
commit e8e12f6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/v4/ResourceResolver.cs
@@ -104,8 +104,9 @@ bool CheckFields(IList<FieldDef> fields) {
 				return false;
 			if (fieldTypes.Count("System.Object") == 2)
 				return true;
-			return fieldTypes.Count("System.Reflection.Assembly") == 1 &&
-				fieldTypes.Count("System.String[]") == 1;
+			if (fieldTypes.Count("System.String[]") != 1)
+				return false;
+			return fieldTypes.Count("System.Reflection.Assembly") == 1 || fieldTypes.Count("System.Object") == 1;
 		}
 
 		public void Initialize(ISimpleDeobfuscator simpleDeobfuscator, IDeobfuscator deob) {