diff --git a/CHANGELOG.md b/CHANGELOG.md index 72dff17a2..71c34e29a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. - [#1904] NullPointerException on decompiler pool - [#1904] AS1/2 Simplify expressions breaks registers, functions - [#1904] AS1/2 Throw is an ExitItem to properly handle continues vs ifs +- AS3 direct editation - protected property resolving ### Changed - Warning before switching deobfuscation is now optional diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AbcIndexing.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AbcIndexing.java index 44c55a14c..3b7289572 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AbcIndexing.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/AbcIndexing.java @@ -562,23 +562,23 @@ public final class AbcIndexing { AbcIndexing.ClassIndex ci = findClass(prop.parent, prop.abc, null); if (ci != null && ci.parent != null && (prop.abc == null || prop.propNsIndex == 0)) { AbcIndexing.ClassIndex ciParent = ci.parent; - DottedChain parentClass = ciParent.abc.instance_info.get(ciParent.index).getName(ciParent.abc.constants).getNameWithNamespace(ciParent.abc.constants, true); + DottedChain parentClass = ciParent.abc.instance_info.get(ciParent.index).getName(ciParent.abc.constants).getNameWithNamespace(ciParent.abc.constants, true); TraitIndex pti = findProperty(new PropertyDef(prop.propName, new TypeItem(parentClass), prop.getPropNsString()), findStatic, findInstance, findProtected); if (pti != null) { return pti; } } - /*if (findProtected && prop.propNsIndex == 0) { + if (findProtected && prop.propNsIndex == 0) { if (ci != null) { int protNs = ci.abc.instance_info.get(ci.index).protectedNS; - PropertyDef prop2 = new PropertyDef(prop.propName, prop.parent, prop.abc, protNs); + PropertyDef prop2 = new PropertyDef(prop.propName, prop.parent, ci.abc, protNs); TraitIndex pti = findProperty(prop2, findStatic, findInstance, false); if (pti != null) { return pti; } } - }*/ + } if (parent != null) { TraitIndex pti = parent.findProperty(prop, findStatic, findInstance, findProtected); if (pti != null) {