LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-11 23:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1888 AS3 - Nullpointer in try..catch detection in cmodule

Browse Source
This commit is contained in:
Jindra Petřík
2022-11-30 22:27:37 +01:00
parent c9e5349349
commit 730ab47ca8
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java
View File

@@ -339,25 +339,27 @@ public class AVM2Graph extends Graph {
int finEndIp = avm2code.adr2pos(ex.end, true) - 1;
GraphPart prevFinallyEndPart = searchPart(finEndIp, allParts);
for (int j = prevFinallyEndPart.start; j <= prevFinallyEndPart.end; j++) {
AVM2Instruction ins = avm2code.code.get(j);
if (ins.definition instanceof NopIns) {
if (prevFinallyEndPart != null) {
for (int j = prevFinallyEndPart.start; j <= prevFinallyEndPart.end; j++) {
AVM2Instruction ins = avm2code.code.get(j);
if (ins.definition instanceof NopIns) {
} else if (ins.definition instanceof PushByteIns) {
defaultPushByte = ins.operands[0];
localData.pushDefaultPart.put(e, prevFinallyEndPart);
} else if (ins.definition instanceof JumpIns) {
} else {
if (localData.pushDefaultPart.containsKey(e)) {
localData.pushDefaultPart.remove(e);
} else if (ins.definition instanceof PushByteIns) {
defaultPushByte = ins.operands[0];
localData.pushDefaultPart.put(e, prevFinallyEndPart);
} else if (ins.definition instanceof JumpIns) {
} else {
if (localData.pushDefaultPart.containsKey(e)) {
localData.pushDefaultPart.remove(e);
}
defaultPushByte = null;
break;
}
defaultPushByte = null;
break;
}
}
if (defaultPushByte == null) {
if (avm2code.code.get(prevFinallyEndPart.end).definition instanceof JumpIns) {
if (prevFinallyEndPart != null && (avm2code.code.get(prevFinallyEndPart.end).definition instanceof JumpIns)) {
prevFinallyEndPart = prevFinallyEndPart.nextParts.get(0);
if (prevFinallyEndPart.nextParts.size() == 1 && prevFinallyEndPart.nextParts.get(0).refs.size() > 1) {
for (int j = prevFinallyEndPart.start; j <= prevFinallyEndPart.end; j++) {