monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into newcode

Browse Source
This commit is contained in:
de4dot 2012-01-10 19:59:27 +01:00
commit f18ed0d6fe
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cecil

@ -1 +1 @@
Subproject commit 9704f4eff88834dc5e6e1a20d9e54e21686ad435
Subproject commit 6603d4c2fd96ce3602b98a4605a9266a882e02cf

2
de4dot.code/deobfuscators/SmartAssembly/AssemblyResolver.cs
View File

@ -64,7 +64,7 @@ namespace de4dot.code.deobfuscators.SmartAssembly {
return null;
var data = decryptResource(info);
if (!assemblyResolverInfo.EmbeddedAssemblyInfos.Remove(info))
if (!assemblyResolverInfo.removeEmbeddedAssemblyInfo(info))
throw new ApplicationException(string.Format("Could not remove resource {0}", Utils.toCsharpString(info.resourceName)));
return data;
}

12
de4dot.code/deobfuscators/SmartAssembly/AssemblyResolverInfo.cs
View File

@ -178,5 +178,17 @@ namespace de4dot.code.deobfuscators.SmartAssembly {
return null;
}
public bool removeEmbeddedAssemblyInfo(EmbeddedAssemblyInfo info) {
bool removed = false;
for (int i = 0; i < EmbeddedAssemblyInfos.Count; i++) {
var other = EmbeddedAssemblyInfos[i];
if (info.simpleName == other.simpleName) {
EmbeddedAssemblyInfos.RemoveAt(i--);
removed = true;
}
}
return removed;
}
}
}