From 012ae459c6a0d2b4560f192cb04bebeb58ce85a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 19 Dec 2021 10:39:51 +0100 Subject: [PATCH] Fixed #1769 - Do not mark getter+setter as colliding (#xxx suffix) --- CHANGELOG.md | 4 +++- .../flash/abc/usages/MethodNameMultinameUsage.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6933c761d..e74ecdef3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,8 @@ All notable changes to this project will be documented in this file. - AS3 - insert debug instruction to mark register names even with activation - AS3 - debugging in inner functions - AS1/2 - debugger - rewinding playback to apply breakpoints -- [#1773] - auto set flagWideCodes on FontInfo wide character adding +- [#1773] - Auto set flagWideCodes on FontInfo wide character adding +- [#1769] - Do not mark getter+setter as colliding (#xxx suffix) ## [15.0.0] - 2021-11-29 ### Added @@ -2348,6 +2349,7 @@ All notable changes to this project will be documented in this file. [#1763]: https://www.free-decompiler.com/flash/issues/1763 [#1766]: https://www.free-decompiler.com/flash/issues/1766 [#1773]: https://www.free-decompiler.com/flash/issues/1773 +[#1769]: https://www.free-decompiler.com/flash/issues/1769 [#1750]: https://www.free-decompiler.com/flash/issues/1750 [#1485]: https://www.free-decompiler.com/flash/issues/1485 [#1681]: https://www.free-decompiler.com/flash/issues/1681 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java index 123c1af7f..612b4af03 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java @@ -12,7 +12,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library. */ + * License along with this library. + */ package com.jpexs.decompiler.flash.abc.usages; import com.jpexs.decompiler.flash.abc.ABC; @@ -39,6 +40,14 @@ public class MethodNameMultinameUsage extends MethodMultinameUsage implements De TraitMultinameUsage otherTrait = (TraitMultinameUsage) other; if (otherTrait.classIndex == classIndex && otherTrait.traitsType == traitsType && otherTrait.parentTraitIndex == parentTraitIndex) { if (other.sameMultinameName(this)) { + + if(other instanceof MethodNameMultinameUsage){ + MethodNameMultinameUsage otherM = (MethodNameMultinameUsage)other; + //getter/setter/method must match + if(otherM.traits.traits.get(otherM.traitIndex).kindType != traits.traits.get(traitIndex).kindType){ + return false; + } + } return true; } }