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

Use next handler if end is reached

Browse Source
This commit is contained in:
de4dot 2014-03-24 20:18:37 +01:00
parent e1d4663f57
commit ff3b87e42e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
de4dot.code/deobfuscators/Agile_NET/vm/v2/CompositeHandlerDetector.cs
View File

@ -53,10 +53,10 @@ namespace de4dot.code.deobfuscators.Agile_NET.vm.v2 {
public readonly int BlockIndex;
public int HashIndex;
public HandlerState(List<BlockSigInfo> blockSigInfos, int blockIndex, int instructionIndex) {
public HandlerState(List<BlockSigInfo> blockSigInfos, int blockIndex, int hashIndex) {
this.BlockSigInfos = blockSigInfos;
this.BlockIndex = blockIndex;
this.HashIndex = instructionIndex;
this.HashIndex = hashIndex;
}
public HandlerState Clone() {
@ -164,6 +164,8 @@ namespace de4dot.code.deobfuscators.Agile_NET.vm.v2 {
}
}
if (nextState == null && findState.VisitedCompositeBlocks.Count != findState.CompositeState.BlockSigInfos.Count)
nextState = GetNextHandlerState(ref findState);
if (nextState == null) {
if (findState.VisitedCompositeBlocks.Count != findState.CompositeState.BlockSigInfos.Count)
return false;
@ -181,6 +183,16 @@ namespace de4dot.code.deobfuscators.Agile_NET.vm.v2 {
}
}
static HandlerState? GetNextHandlerState(ref FindHandlerState findState) {
for (int i = 0; i < findState.CompositeState.BlockSigInfos.Count; i++) {
if (findState.VisitedCompositeBlocks.ContainsKey(i))
continue;
return new HandlerState(findState.CompositeState.BlockSigInfos, i, 0);
}
return null;
}
static bool Compare(ref HandlerState handler, ref HandlerState composite) {
var hhashes = handler.BlockSigInfos[handler.BlockIndex].Hashes;
int hi = handler.HashIndex;