Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
8dd76420
J
jadx
项目概览
keyescgm
/
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,发现更多精彩内容 >>
提交
8dd76420
编写于
1月 02, 2021
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(deobf): complete disable rename if all rename options unchecked (#1076)
上级
dfe026ac
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
59 addition
and
12 deletion
+59
-12
jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
+2
-1
jadx-core/src/main/java/jadx/core/dex/visitors/RenameVisitor.java
...e/src/main/java/jadx/core/dex/visitors/RenameVisitor.java
+14
-11
jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java
...ests/integration/deobf/a/TestNegativeRenameCondition.java
+43
-0
未找到文件。
jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
浏览文件 @
8dd76420
...
...
@@ -313,7 +313,8 @@ public class Deobfuscator {
}
else
{
if
(!
clsMap
.
containsKey
(
classInfo
))
{
String
clsShortName
=
classInfo
.
getShortName
();
boolean
badName
=
shouldRename
(
clsShortName
)
||
reservedClsNames
.
contains
(
clsShortName
);
boolean
badName
=
shouldRename
(
clsShortName
)
||
(
args
.
isRenameValid
()
&&
reservedClsNames
.
contains
(
clsShortName
));
makeClsAlias
(
cls
,
badName
);
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/RenameVisitor.java
浏览文件 @
8dd76420
...
...
@@ -188,6 +188,8 @@ public class RenameVisitor extends AbstractVisitor {
mth
.
addAttr
(
new
RenameReasonAttr
(
mth
,
notValid
,
notPrintable
));
}
}
// Rename methods with same signature
if
(
args
.
isRenameValid
())
{
Set
<
String
>
names
=
new
HashSet
<>(
methods
.
size
());
for
(
MethodNode
mth
:
methods
)
{
AccessInfo
accessFlags
=
mth
.
getAccessFlags
();
...
...
@@ -202,6 +204,7 @@ public class RenameVisitor extends AbstractVisitor {
}
}
}
}
private
static
void
processRootPackages
(
Deobfuscator
deobfuscator
,
RootNode
root
,
List
<
ClassNode
>
classes
)
{
Set
<
String
>
rootPkgs
=
collectRootPkgs
(
classes
);
...
...
jadx-core/src/test/java/jadx/tests/integration/deobf/a/TestNegativeRenameCondition.java
0 → 100644
浏览文件 @
8dd76420
package
jadx.tests.integration.deobf.a
;
import
java.util.Collections
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestNegativeRenameCondition
extends
IntegrationTest
{
public
static
class
TestCls
{
@SuppressWarnings
(
"checkstyle:TypeName"
)
public
interface
a
{
@SuppressWarnings
(
"checkstyle:MethodName"
)
void
a
();
}
public
void
test
(
a
a
)
{
a
.
a
();
}
}
@Test
public
void
test
()
{
noDebugInfo
();
enableDeobfuscation
();
// disable rename by length
args
.
setDeobfuscationMinLength
(
0
);
args
.
setDeobfuscationMaxLength
(
999
);
// disable all renaming options
args
.
setRenameFlags
(
Collections
.
emptySet
());
assertThat
(
getClassNode
(
TestCls
.
class
))
.
code
()
.
doesNotContain
(
"renamed from"
)
.
containsOne
(
"package jadx.tests.integration.deobf.a;"
)
.
containsOne
(
"public interface a {"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录