From 2d6180db50821cb4931704d95391c904a184376e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 2 Apr 2023 20:18:22 +0200 Subject: [PATCH] Fixed #1999 AS3 decompilation - XML constructor call with other than string argument --- CHANGELOG.md | 2 ++ .../flash/abc/avm2/instructions/construction/ConstructIns.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b5bdc34e..dfcf8c7d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. - [#1477] Open file (Context menu) with unicode characters, unicode in paths, on Windows - Starting app with parameters causing wrong GUI init - [#1991] ConcurrentModificationException on clearing cache thread +- [#1999] AS3 decompilation - XML constructor call with other than string argument ### Changed - [#1996] Items are now exported in order of appearance in the tag tree (usually SWF order), previously was it in order of selection @@ -3024,6 +3025,7 @@ All notable changes to this project will be documented in this file. [#1994]: https://www.free-decompiler.com/flash/issues/1994 [#1477]: https://www.free-decompiler.com/flash/issues/1477 [#1991]: https://www.free-decompiler.com/flash/issues/1991 +[#1999]: https://www.free-decompiler.com/flash/issues/1999 [#1996]: https://www.free-decompiler.com/flash/issues/1996 [#1888]: https://www.free-decompiler.com/flash/issues/1888 [#1892]: https://www.free-decompiler.com/flash/issues/1892 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java index 13d7a5b87..2d5efd275 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java @@ -80,7 +80,7 @@ public class ConstructIns extends InstructionDefinition { public static boolean walkXML(GraphTargetItem item, List list) { boolean ret = walkXMLSub(item, list); - if (list.size() == 1) { + if (list.size() == 1 && (list.get(0) instanceof StringAVM2Item)) { return true; } return ret;