From 8eabe85311ad928d1c973da1e38c962ca484e421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jind=C5=99ich=20Pet=C5=99=C3=ADk?= Date: Tue, 3 Sep 2024 10:07:05 +0200 Subject: [PATCH] Fixed: #2299 AS1/2 - Nullpointer on loadMovie with register as parameter --- CHANGELOG.md | 2 ++ .../com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b44dd7cf..2a1ee73dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Fixed - [#2293] FLA export - stackoverflow on multilevel clips extraction, clipping - [#2294] FLA export - Nullpointer on AS3 SWFs without document class +- [#2299] AS1/2 - Nullpointer on loadMovie with register as parameter ## [21.0.4] - 2024-08-27 ### Fixed @@ -3533,6 +3534,7 @@ Major version of SWF to XML export changed to 2. [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#2293]: https://www.free-decompiler.com/flash/issues/2293 [#2294]: https://www.free-decompiler.com/flash/issues/2294 +[#2299]: https://www.free-decompiler.com/flash/issues/2299 [#2266]: https://www.free-decompiler.com/flash/issues/2266 [#2275]: https://www.free-decompiler.com/flash/issues/2275 [#2276]: https://www.free-decompiler.com/flash/issues/2276 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java index 3d45e2148..a1fbe6173 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java @@ -209,7 +209,7 @@ public class ActionGetURL2 extends Action { output.add(new LoadVariablesActionItem(this, lineStartAction, urlString, targetString, sendVarsMethod)); } } else if (loadTargetFlag) { - if ((urlString instanceof DirectValueActionItem) && (urlString.getResult().equals(""))) { + if ((urlString instanceof DirectValueActionItem) && ("".equals(urlString.getResult()))) { output.add(new UnLoadMovieActionItem(this, lineStartAction, targetString)); } else { output.add(new LoadMovieActionItem(this, lineStartAction, urlString, targetString, sendVarsMethod));