From aea9c264287fed915b0323e5773084bd6e9d2cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Fri, 17 Jan 2025 21:07:26 +0100 Subject: [PATCH] Fixed: #2393 AS1/2 ActionGotoFrame2 P-code trailing comma --- CHANGELOG.md | 6 ++++-- .../decompiler/flash/action/swf4/ActionGotoFrame2.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41bbde36b..2e330747a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,9 @@ All notable changes to this project will be documented in this file. - AS1/2 - Push action hilighting, GetProperty, Call action hilighting - [#2381] Font color values with alpha allowed in html edittext, but alpha ignored - [#2384] Vanishing pins on AS3 code editing save, on script deletion and few other cases -- [#2394] Broken deobfuscation on incorrect length of ActionStrictMode, -- [#2394] ActionStrictMode with mode larger than 1 now ignored +- [#2394] Broken AS1/2 deobfuscation on incorrect length of ActionStrictMode, +- [#2394] AS1/2 ActionStrictMode with mode larger than 1 now ignored +- [#2393] AS1/2 ActionGotoFrame2 P-code trailing comma ## [22.0.1] - 2024-11-20 ### Added @@ -3689,6 +3690,7 @@ Major version of SWF to XML export changed to 2. [#2381]: https://www.free-decompiler.com/flash/issues/2381 [#2384]: https://www.free-decompiler.com/flash/issues/2384 [#2394]: https://www.free-decompiler.com/flash/issues/2394 +[#2393]: https://www.free-decompiler.com/flash/issues/2393 [#2366]: https://www.free-decompiler.com/flash/issues/2366 [#2367]: https://www.free-decompiler.com/flash/issues/2367 [#2372]: https://www.free-decompiler.com/flash/issues/2372 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java index c9079b5ee..6c789766d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java @@ -121,7 +121,7 @@ public class ActionGotoFrame2 extends Action { @Override public String toString() { - return "GotoFrame2 " + sceneBiasFlag + ", " + playFlag + ", " + (sceneBiasFlag ? ", " + sceneBias : ""); + return "GotoFrame2 " + sceneBiasFlag + ", " + playFlag + (sceneBiasFlag ? ", " + sceneBias : ""); } /**