LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-27 13:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not use line info in block (obfuscated SWFs break it)

Browse Source 
Issue #961 Final process fix
This commit is contained in:
Jindra Petřík
2015-07-10 19:52:29 +02:00
parent 68820fda7a
commit 8a154b48e0
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
View File

@@ -537,7 +537,7 @@ public class Graph {
if (exprLine > 0) {
List<GraphTargetItem> forFirstCommands = new ArrayList<>();
for (int j = i - 1; j >= 0; j--) {
if (list.get(j).getLine() == exprLine) {
if (list.get(j).getLine() == exprLine && !(list.get(j) instanceof LoopItem /*to avoid recursion and StackOverflow*/)) {
forFirstCommands.add(0, list.get(j));
removeFromList.add(j);
} else {
@@ -571,6 +571,11 @@ public class Graph {
}
}
if (!forFirstCommands.isEmpty() || !forFinalCommands.isEmpty()) {
//Do not allow more than 2 first/final commands, since it can be obfuscated
if (forFirstCommands.size() > 2 || forFinalCommands.size() > 2) {
removeFromList.clear();
whi.commands.addAll(forFinalCommands); //put it back
}
if (whi.commands.isEmpty() && forFirstCommands.isEmpty()) {
//it would be for(;expr;commands) {} which looks better as while(expr){commands}
whi.commands.addAll(forFinalCommands); //put it back