From 0f627d728c4d621eb2deedf4698fc9f9280d25f4 Mon Sep 17 00:00:00 2001 From: de4dot Date: Tue, 8 Nov 2011 19:27:27 +0100 Subject: [PATCH] Use new FieldTypes code --- .../dotNET_Reactor/AssemblyResolver.cs | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/de4dot.code/deobfuscators/dotNET_Reactor/AssemblyResolver.cs b/de4dot.code/deobfuscators/dotNET_Reactor/AssemblyResolver.cs index 92fd306d..12f23b33 100644 --- a/de4dot.code/deobfuscators/dotNET_Reactor/AssemblyResolver.cs +++ b/de4dot.code/deobfuscators/dotNET_Reactor/AssemblyResolver.cs @@ -132,23 +132,10 @@ namespace de4dot.deobfuscators.dotNET_Reactor { if (fields.Count != 2) return false; - int fieldAssembly = 0, fieldBool = 0; - foreach (var field in fields) { - switch (field.FieldType.FullName) { - case "System.Collections.Hashtable": - case "System.Object": - fieldAssembly++; - break; - - case "System.Boolean": - fieldBool++; - break; - - default: - return false; - } - } - return fieldAssembly == 1 && fieldBool == 1; + var fieldTypes = new FieldTypes(fields); + return fieldTypes.count("System.Boolean") == 1 && + (fieldTypes.count("System.Collections.Hashtable") == 1 || + fieldTypes.count("System.Object") == 1); } static MethodDefinition findAssemblyResolveMethod(TypeDefinition type) {