Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-11-30 16:10:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: don't remove synthetic method if args count or name not same (#361)

Browse Source
This commit is contained in:
Skylot 2018-11-09 19:54:00 +03:00
parent 5281eed1a5
commit 20b03aa755
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
View File

@ -1,6 +1,7 @@
package jadx.core.dex.visitors;
import java.util.List;
import java.util.Objects;
import jadx.core.dex.attributes.AFlag;
import jadx.core.dex.attributes.AType;
@ -216,6 +217,9 @@ public class ClassModifier extends AbstractVisitor {
MethodInfo callMth = ((InvokeNode) insn).getCallMth();
MethodNode wrappedMth = mth.root().deepResolveMethod(callMth);
if (wrappedMth != null) {
if (callMth.getArgsCount() != mth.getMethodInfo().getArgsCount()) {
return false;
}
// all args must be registers passed from method args (allow only casts insns)
for (InsnArg arg : insn.getArguments()) {
if (!registersAndCastsOnly(arg)) {
@ -223,9 +227,13 @@ public class ClassModifier extends AbstractVisitor {
}
}
String alias = mth.getAlias();
if (!wrappedMth.getAlias().equals(alias) && wrappedMth.isVirtual()) {
wrappedMth.getMethodInfo().setAlias(alias);
if (Objects.equals(wrappedMth.getAlias(), alias)) {
return true;
}
if (!wrappedMth.isVirtual()) {
return false;
}
wrappedMth.getMethodInfo().setAlias(alias);
return true;
}
}