From b39456f3e4997db301a47099e03c18e65650251a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Mon, 1 Apr 2013 17:32:11 +0200 Subject: [PATCH] AS1/2 deobfuscation fix --- trunk/src/com/jpexs/decompiler/flash/action/Action.java | 2 +- trunk/src/com/jpexs/decompiler/flash/graph/Graph.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index f0c4dca6c..84e2b0cef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -675,7 +675,7 @@ public class Action implements GraphSourceItem { GraphTargetItem inItem = null; int loopStart = 0; loopip: - while (ip <= end + 1) { + while (ip <= end) { long addr = ip2adr(actions, ip, version); /*if (unknownJumps.contains(addr)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java index 733c45f4a..edf3b3bee 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java @@ -1320,6 +1320,7 @@ public class Graph { } if(ins instanceof GraphSourceItemContainer){ ip=code.adr2pos(((GraphSourceItemContainer)ins).getEndAddress()); + continue; }else if (ins.isExit()) { part.end = ip;