diff --git a/CHANGELOG.md b/CHANGELOG.md index a5086e001..728869fea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed +- [#1948] Timeout while deobfuscation did not skip method ## [18.3.3] - 2023-01-22 ### Added @@ -2904,6 +2906,7 @@ All notable changes to this project will be documented in this file. [alpha 9]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha8...alpha9 [alpha 8]: https://github.com/jindrapetrik/jpexs-decompiler/compare/alpha7...alpha8 [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 +[#1948]: https://www.free-decompiler.com/flash/issues/1948 [#1913]: https://www.free-decompiler.com/flash/issues/1913 [#1888]: https://www.free-decompiler.com/flash/issues/1888 [#1894]: https://www.free-decompiler.com/flash/issues/1894 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java index 2bf1e2801..c9e01b5df 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/script/DependencyParser.java @@ -109,7 +109,7 @@ public class DependencyParser { } } MethodBody body = abc.findBody(method_index); - if (body != null) { + if (body != null && body.convertException == null) { body = body.convertMethodBodyCanUseLast(Configuration.autoDeobfuscate.get(), "", isStatic, scriptIndex, classIndex, abc, trait); body.traits.getDependencies(scriptIndex, classIndex, isStatic, ignoredCustom, abc, dependencies, uses, ignorePackage, fullyQualifiedNames); for (ABCException ex : body.exceptions) {