LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 17:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try..catch fix

Browse Source
This commit is contained in:
Jindra Petřík
2025-09-01 17:01:28 +02:00
parent c8a8ff2fea
commit c3b33b3128
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
+16 -5
View File
@@ -1306,7 +1306,14 @@ public class AVM2Graph extends Graph {
boolean isEmpty = true;
for (int i = 0; i < finallyTargetItems.size(); i++) {
GraphTargetItem it = finallyTargetItems.get(i);
if (it instanceof SetLocalAVM2Item) {
if (it instanceof SetTemporaryItem) {
if (it.value.getNotCoerced() instanceof ExceptionAVM2Item) {
//okay
} else {
isEmpty = false;
break;
}
} else if (it instanceof SetLocalAVM2Item) {
if (it.value.getNotCoerced() instanceof ExceptionAVM2Item) {
//okay
} else {
@@ -1431,10 +1438,14 @@ public class AVM2Graph extends Graph {
List<GraphTargetItem> currentCatchCommands = printGraph(foundGotos, partCodes, partCodePos, visited, localData2, st2, allParts, null, catchPart, stopPart2, stopPartKind2, loops, throwStates, staticOperation, path);
st2.finishBlock(currentCatchCommands);
while (!currentCatchCommands.isEmpty()
&& currentCatchCommands.get(0) instanceof SetTemporaryItem
&& currentCatchCommands.get(0).value.getNotCoerced() instanceof ExceptionAVM2Item) {
currentCatchCommands.remove(0);
int tempExceptionPos = 0;
if (!currentCatchCommands.isEmpty() && currentCatchCommands.get(0) instanceof WithAVM2Item) {
tempExceptionPos++;
}
while (currentCatchCommands.size() > tempExceptionPos
&& currentCatchCommands.get(tempExceptionPos) instanceof SetTemporaryItem
&& currentCatchCommands.get(tempExceptionPos).value.getNotCoerced() instanceof ExceptionAVM2Item) {
currentCatchCommands.remove(tempExceptionPos);
}
loopwith:
while (!currentCatchCommands.isEmpty() && (currentCatchCommands.get(0) instanceof WithAVM2Item)) {