diff --git a/CHANGELOG.md b/CHANGELOG.md index e370fbed5..198fbe37f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Fixed - [#1888] Casts for missing types, cast handling for script local classes - [#1895] Handling of unstructured switch +- [#1896] NullPointer during deobfuscation ## [17.0.3] - 2022-11-30 ### Added @@ -2674,6 +2675,7 @@ All notable changes to this project will be documented in this file. [alpha 7]: https://github.com/jindrapetrik/jpexs-decompiler/releases/tag/alpha7 [#1888]: https://www.free-decompiler.com/flash/issues/1888 [#1895]: https://www.free-decompiler.com/flash/issues/1895 +[#1896]: https://www.free-decompiler.com/flash/issues/1896 [#1769]: https://www.free-decompiler.com/flash/issues/1769 [#1890]: https://www.free-decompiler.com/flash/issues/1890 [#1810]: https://www.free-decompiler.com/flash/issues/1810 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java index e17c1afc4..412fa80e1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java @@ -133,7 +133,7 @@ public abstract class GetLocalTypeIns extends InstructionDefinition { SetLocalAVM2Item setLocal = (SetLocalAVM2Item) setItem.value.getNotCoerced(); if (setLocal.regIndex == regId) { int setLocalIp = localData.code.adr2pos(setLocal.getSrc().getAddress()); - if (localData.setLocalPosToGetLocalPos.get(setLocalIp).size() == 1) { + if (localData.getSetLocalUsages(setLocalIp).size() == 1) { if ((setItem.value instanceof CoerceAVM2Item) || (setItem.value instanceof ConvertAVM2Item)) { setItem.value.value = setLocal.value; } else {