Merge branch 'master' into newcode
This commit is contained in:
commit
f18ed0d6fe
2
cecil
2
cecil
|
@ -1 +1 @@
|
|||
Subproject commit 9704f4eff88834dc5e6e1a20d9e54e21686ad435
|
||||
Subproject commit 6603d4c2fd96ce3602b98a4605a9266a882e02cf
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user