Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_39073359
jadx
提交
3d920725
J
jadx
项目概览
qq_39073359
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jadx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
3d920725
编写于
6月 29, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: check synthetic methods before remove/inline (#1560)
上级
2f2fbea5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
91 addition
and
26 deletion
+91
-26
jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
...e/src/main/java/jadx/core/dex/visitors/ClassModifier.java
+3
-19
jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
...ain/java/jadx/core/dex/visitors/rename/RenameVisitor.java
+0
-7
jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java
...tests/integration/inline/TestOverlapSyntheticMethods.java
+47
-0
jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali
...e/src/test/smali/inline/TestOverlapSyntheticMethods.smali
+41
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/ClassModifier.java
浏览文件 @
3d920725
...
...
@@ -225,7 +225,7 @@ public class ClassModifier extends AbstractVisitor {
}
private
static
boolean
removeBridgeMethod
(
ClassNode
cls
,
MethodNode
mth
)
{
if
(
cls
.
root
().
getArgs
().
is
RenameValid
())
{
if
(
cls
.
root
().
getArgs
().
is
InlineMethods
())
{
// simple wrapper remove is same as inline
List
<
InsnNode
>
allInsns
=
BlockUtils
.
collectAllInsns
(
mth
.
getBasicBlocks
());
if
(
allInsns
.
size
()
==
1
)
{
InsnNode
wrappedInsn
=
allInsns
.
get
(
0
);
...
...
@@ -235,12 +235,10 @@ public class ClassModifier extends AbstractVisitor {
wrappedInsn
=
((
InsnWrapArg
)
arg
).
getWrapInsn
();
}
}
if
(
checkSyntheticWrapper
(
mth
,
wrappedInsn
))
{
return
true
;
}
return
checkSyntheticWrapper
(
mth
,
wrappedInsn
);
}
}
return
!
isMethodUnique
(
cls
,
mth
)
;
return
false
;
}
private
static
boolean
checkSyntheticWrapper
(
MethodNode
mth
,
InsnNode
insn
)
{
...
...
@@ -299,20 +297,6 @@ public class ClassModifier extends AbstractVisitor {
return
false
;
}
private
static
boolean
isMethodUnique
(
ClassNode
cls
,
MethodNode
mth
)
{
MethodInfo
mi
=
mth
.
getMethodInfo
();
for
(
MethodNode
otherMth
:
cls
.
getMethods
())
{
if
(
otherMth
!=
mth
)
{
MethodInfo
omi
=
otherMth
.
getMethodInfo
();
if
(
omi
.
getName
().
equals
(
mi
.
getName
())
&&
Objects
.
equals
(
omi
.
getArgumentsTypes
(),
mi
.
getArgumentsTypes
()))
{
return
false
;
}
}
}
return
true
;
}
/**
* Remove public empty constructors (static or default)
*/
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
浏览文件 @
3d920725
...
...
@@ -14,9 +14,7 @@ import jadx.core.Consts;
import
jadx.core.codegen.json.JsonMappingGen
;
import
jadx.core.deobf.Deobfuscator
;
import
jadx.core.deobf.NameMapper
;
import
jadx.core.dex.attributes.AFlag
;
import
jadx.core.dex.attributes.nodes.RenameReasonAttr
;
import
jadx.core.dex.info.AccessInfo
;
import
jadx.core.dex.info.ClassInfo
;
import
jadx.core.dex.info.FieldInfo
;
import
jadx.core.dex.nodes.ClassNode
;
...
...
@@ -196,11 +194,6 @@ public class RenameVisitor extends AbstractVisitor {
if
(
args
.
isRenameValid
())
{
Set
<
String
>
names
=
new
HashSet
<>(
methods
.
size
());
for
(
MethodNode
mth
:
methods
)
{
AccessInfo
accessFlags
=
mth
.
getAccessFlags
();
if
(
accessFlags
.
isBridge
()
||
accessFlags
.
isSynthetic
()
||
mth
.
contains
(
AFlag
.
DONT_GENERATE
)
/* this flag not set yet */
)
{
continue
;
}
String
signature
=
mth
.
getMethodInfo
().
makeSignature
(
true
,
false
);
if
(!
names
.
add
(
signature
))
{
deobfuscator
.
forceRenameMethod
(
mth
);
...
...
jadx-core/src/test/java/jadx/tests/integration/inline/TestOverlapSyntheticMethods.java
0 → 100644
浏览文件 @
3d920725
package
jadx.tests.integration.inline
;
import
java.util.Collections
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
@SuppressWarnings
(
"CommentedOutCode"
)
public
class
TestOverlapSyntheticMethods
extends
SmaliTest
{
// @formatter:off
/*
public String test(int i) {
return a(i) + "|" + a(i);
}
public int a(int i) {
return i;
}
public String a(int i) {
return "i:" + i;
}
*/
// @formatter:on
@Test
public
void
testSmali
()
{
assertThat
(
getClassNodeFromSmali
())
.
code
()
.
containsOne
(
"int a(int i) {"
)
.
containsOne
(
"String m0a(int i) {"
);
}
@Test
public
void
testSmaliNoRename
()
{
getArgs
().
setRenameFlags
(
Collections
.
emptySet
());
disableCompilation
();
assertThat
(
getClassNodeFromSmali
())
.
code
()
.
containsOne
(
"int a(int i) {"
)
.
containsOne
(
"String a(int i) {"
)
.
containsOne
(
"return a(i) + \"|\" + a(i);"
);
}
}
jadx-core/src/test/smali/inline/TestOverlapSyntheticMethods.smali
0 → 100644
浏览文件 @
3d920725
.class public Linline/TestOverlapSyntheticMethods;
.super Ljava/lang/Object;
.method public synthetic a(I)I
.registers 2
return p1
.end method
.method public synthetic a(I)Ljava/lang/String;
.registers 4
new-instance v0, Ljava/lang/StringBuilder;
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
const-string v1, "i:"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
move-result-object v0
invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
move-result-object v0
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object v0
return-object v0
.end method
.method public test(I)Ljava/lang/String;
.registers 4
new-instance v0, Ljava/lang/StringBuilder;
invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
invoke-virtual {p0, p1}, Linline/TestOverlapSyntheticMethods;->a(I)I
move-result v1
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
move-result-object v0
const-string v1, "|"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
move-result-object v0
invoke-virtual {p0, p1}, Linline/TestOverlapSyntheticMethods;->a(I)Ljava/lang/String;
move-result-object v1
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
move-result-object v0
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object v0
return-object v0
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录