From 7bb8061e208b88f732fc7a727d29b53325dd7785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Tue, 20 Dec 2022 10:49:35 +0100 Subject: [PATCH] Fixed #1904 AS1/2 Throw is an ExitItem to properly handle continues vs ifs --- CHANGELOG.md | 1 + .../jpexs/decompiler/flash/action/model/ThrowActionItem.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60f3541d2..72dff17a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. - [#1904] NullPointerException on ErrorLog frame - [#1904] NullPointerException on decompiler pool - [#1904] AS1/2 Simplify expressions breaks registers, functions +- [#1904] AS1/2 Throw is an ExitItem to properly handle continues vs ifs ### Changed - Warning before switching deobfuscation is now optional diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java index 3a33a751f..62e6111b1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java @@ -24,6 +24,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemPos; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.ExitItem; import com.jpexs.decompiler.graph.model.LocalData; import java.util.List; import java.util.Objects; @@ -32,7 +33,7 @@ import java.util.Objects; * * @author JPEXS */ -public class ThrowActionItem extends ActionItem { +public class ThrowActionItem extends ActionItem implements ExitItem { public ThrowActionItem(GraphSourceItem instruction, GraphSourceItem lineStartIns, GraphTargetItem object) { super(instruction, lineStartIns, PRECEDENCE_PRIMARY, object);