Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
79477a2d
J
jadx
项目概览
ql04210214
/
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,发现更多精彩内容 >>
未验证
提交
79477a2d
编写于
9月 23, 2022
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: don't rename bridged overridden methods (#1672)
上级
78aadda9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
68 addition
and
1 deletion
+68
-1
jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
...ain/java/jadx/core/dex/visitors/rename/RenameVisitor.java
+21
-1
jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticBridgeRename.java
...x/tests/integration/inline/TestSyntheticBridgeRename.java
+47
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/rename/RenameVisitor.java
浏览文件 @
79477a2d
...
@@ -14,6 +14,9 @@ import jadx.core.Consts;
...
@@ -14,6 +14,9 @@ import jadx.core.Consts;
import
jadx.core.codegen.json.JsonMappingGen
;
import
jadx.core.codegen.json.JsonMappingGen
;
import
jadx.core.deobf.Deobfuscator
;
import
jadx.core.deobf.Deobfuscator
;
import
jadx.core.deobf.NameMapper
;
import
jadx.core.deobf.NameMapper
;
import
jadx.core.dex.attributes.AFlag
;
import
jadx.core.dex.attributes.AType
;
import
jadx.core.dex.attributes.nodes.MethodOverrideAttr
;
import
jadx.core.dex.attributes.nodes.RenameReasonAttr
;
import
jadx.core.dex.attributes.nodes.RenameReasonAttr
;
import
jadx.core.dex.info.ClassInfo
;
import
jadx.core.dex.info.ClassInfo
;
import
jadx.core.dex.info.FieldInfo
;
import
jadx.core.dex.info.FieldInfo
;
...
@@ -195,7 +198,7 @@ public class RenameVisitor extends AbstractVisitor {
...
@@ -195,7 +198,7 @@ public class RenameVisitor extends AbstractVisitor {
Set
<
String
>
names
=
new
HashSet
<>(
methods
.
size
());
Set
<
String
>
names
=
new
HashSet
<>(
methods
.
size
());
for
(
MethodNode
mth
:
methods
)
{
for
(
MethodNode
mth
:
methods
)
{
String
signature
=
mth
.
getMethodInfo
().
makeSignature
(
true
,
false
);
String
signature
=
mth
.
getMethodInfo
().
makeSignature
(
true
,
false
);
if
(!
names
.
add
(
signature
))
{
if
(!
names
.
add
(
signature
)
&&
canRename
(
mth
)
)
{
deobfuscator
.
forceRenameMethod
(
mth
);
deobfuscator
.
forceRenameMethod
(
mth
);
mth
.
addAttr
(
new
RenameReasonAttr
(
"collision with other method in class"
));
mth
.
addAttr
(
new
RenameReasonAttr
(
"collision with other method in class"
));
}
}
...
@@ -203,6 +206,23 @@ public class RenameVisitor extends AbstractVisitor {
...
@@ -203,6 +206,23 @@ public class RenameVisitor extends AbstractVisitor {
}
}
}
}
private
static
boolean
canRename
(
MethodNode
mth
)
{
if
(
mth
.
contains
(
AFlag
.
DONT_RENAME
))
{
return
false
;
}
MethodOverrideAttr
overrideAttr
=
mth
.
get
(
AType
.
METHOD_OVERRIDE
);
if
(
overrideAttr
!=
null
)
{
for
(
MethodNode
relatedMth
:
overrideAttr
.
getRelatedMthNodes
())
{
if
(
relatedMth
!=
mth
&&
mth
.
getParentClass
().
equals
(
relatedMth
.
getParentClass
()))
{
// ignore rename if exists related method from same class (bridge method in most cases)
// such rename will also rename current method and will not help to resolve name collision
return
false
;
}
}
}
return
true
;
}
private
static
void
processRootPackages
(
Deobfuscator
deobfuscator
,
RootNode
root
,
List
<
ClassNode
>
classes
)
{
private
static
void
processRootPackages
(
Deobfuscator
deobfuscator
,
RootNode
root
,
List
<
ClassNode
>
classes
)
{
Set
<
String
>
rootPkgs
=
collectRootPkgs
(
classes
);
Set
<
String
>
rootPkgs
=
collectRootPkgs
(
classes
);
root
.
getCacheStorage
().
setRootPkgs
(
rootPkgs
);
root
.
getCacheStorage
().
setRootPkgs
(
rootPkgs
);
...
...
jadx-core/src/test/java/jadx/tests/integration/inline/TestSyntheticBridgeRename.java
0 → 100644
浏览文件 @
79477a2d
package
jadx.tests.integration.inline
;
import
org.assertj.core.api.Condition
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
jadx.tests.api.extensions.profiles.TestProfile
;
import
jadx.tests.api.extensions.profiles.TestWithProfiles
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestSyntheticBridgeRename
extends
IntegrationTest
{
@SuppressWarnings
(
"InnerClassMayBeStatic"
)
public
static
class
TestCls
{
private
abstract
class
Inner
<
V
>
{
public
abstract
V
get
(
String
value
);
}
public
class
IntInner
extends
Inner
<
Integer
>
{
public
Integer
get
(
String
value
)
{
return
value
.
length
();
}
}
public
void
test
()
{
IntInner
inner
=
new
IntInner
();
call
(
inner
.
get
(
"a"
));
}
private
static
void
call
(
Integer
value
)
{
}
}
@TestWithProfiles
({
TestProfile
.
DX_J8
,
TestProfile
.
JAVA8
})
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
assertThat
(
searchCls
(
cls
.
getInnerClasses
(),
"IntInner"
).
getMethods
())
.
as
(
"check that bridge method was generated by compiler"
)
.
haveAtLeastOne
(
new
Condition
<>(
mth
->
mth
.
getAccessFlags
().
isBridge
(),
"bridge"
));
assertThat
(
cls
)
.
code
()
.
doesNotContain
(
"mo0get"
)
.
containsOne
(
"call(inner.get(\"a\"));"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录