LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-15 06:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

build fix + catch ThreadDeath errors

Browse Source
This commit is contained in:
honfika@gmail.com
2015-07-11 09:32:02 +02:00
parent 9009cf022a
commit 737f20edd4
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegisters.java
View File

@@ -296,7 +296,7 @@ public class AVM2DeobfuscatorRegisters extends AVM2DeobfuscatorSimple {
break;
}
}
} catch (InterruptedException ex) {
} catch (ThreadDeath | InterruptedException ex) {
throw ex;
} catch (Throwable ex) {
//ignore

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java
View File

@@ -355,7 +355,7 @@ public final class MethodBody implements Cloneable {
if (Configuration.autoDeobfuscate.get()) {
try {
code.removeTraps(constants, trait, method_info.get(this.method_info), body, abc, scriptIndex, classIndex, isStatic, path);
} catch (InterruptedException ex) {
} catch (ThreadDeath | InterruptedException ex) {
throw ex;
} catch (Throwable ex) {
//ignore

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

@@ -52,8 +52,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
@@ -559,7 +557,7 @@ public class Graph {
List<GraphTargetItem> forFinalCommands = new ArrayList<>();
for (int j = i - 1; j >= 0; j--) {
GraphTargetItem itemJ = list.get(i);
GraphTargetItem itemJ = list.get(j);
if (itemJ.getLine() == whileExprLine && !(itemJ instanceof LoopItem /*to avoid recursion and StackOverflow*/)) {
forFirstCommands.add(0, itemJ);
toDelete[j] = true;
@@ -836,7 +834,7 @@ public class Graph {
private void getPrecontinues(String path, BaseLocalData localData, GraphPart parent, GraphPart part, List<GraphPart> allParts, List<Loop> loops, List<GraphPart> stopPart) throws InterruptedException {
try {
markLevels(path, localData, part, allParts, loops);
} catch (InterruptedException iex) {
} catch (ThreadDeath | InterruptedException iex) {
throw iex;
} catch (Throwable ex) {
//It is unusual code so markLevels failed, nevermind, it can still work