Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
ed9fe8a5
J
jadx
项目概览
Quincy379
/
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,发现更多精彩内容 >>
提交
ed9fe8a5
编写于
7月 13, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: incorrect init values of inherited fields
上级
49e234d9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
75 addition
and
3 deletion
+75
-3
jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
...rc/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
+18
-3
jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit3.java
...st/java/jadx/tests/integration/others/TestFieldInit3.java
+57
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
浏览文件 @
ed9fe8a5
...
...
@@ -92,7 +92,7 @@ public class ExtractFieldInit extends AbstractVisitor {
List
<
InsnNode
>
initInsns
=
getFieldAssigns
(
classInitMth
,
field
,
InsnType
.
SPUT
);
if
(
initInsns
.
size
()
==
1
)
{
InsnNode
insn
=
initInsns
.
get
(
0
);
if
(
checkInsn
(
insn
))
{
if
(
checkInsn
(
cls
,
insn
))
{
InsnArg
arg
=
insn
.
getArg
(
0
);
if
(
arg
instanceof
InsnWrapArg
)
{
((
InsnWrapArg
)
arg
).
getWrapInsn
().
add
(
AFlag
.
DECLARE_VAR
);
...
...
@@ -137,7 +137,7 @@ public class ExtractFieldInit extends AbstractVisitor {
// TODO: check not only first block
BlockNode
blockNode
=
constrMth
.
getBasicBlocks
().
get
(
0
);
for
(
InsnNode
insn
:
blockNode
.
getInstructions
())
{
if
(
insn
.
getType
()
==
InsnType
.
IPUT
&&
checkInsn
(
insn
))
{
if
(
insn
.
getType
()
==
InsnType
.
IPUT
&&
checkInsn
(
cls
,
insn
))
{
info
.
getPutInsns
().
add
(
insn
);
}
else
if
(!
info
.
getPutInsns
().
isEmpty
())
{
break
;
...
...
@@ -199,7 +199,22 @@ public class ExtractFieldInit extends AbstractVisitor {
return
true
;
}
private
static
boolean
checkInsn
(
InsnNode
insn
)
{
private
static
boolean
checkInsn
(
ClassNode
cls
,
InsnNode
insn
)
{
if
(
insn
instanceof
IndexInsnNode
)
{
FieldInfo
fieldInfo
=
(
FieldInfo
)
((
IndexInsnNode
)
insn
).
getIndex
();
if
(!
fieldInfo
.
getDeclClass
().
equals
(
cls
.
getClassInfo
()))
{
// exclude fields from super classes
return
false
;
}
FieldNode
fieldNode
=
cls
.
dex
().
resolveField
(
fieldInfo
);
if
(
fieldNode
==
null
)
{
// exclude inherited fields (not declared in this class)
return
false
;
}
}
else
{
return
false
;
}
InsnArg
arg
=
insn
.
getArg
(
0
);
if
(
arg
.
isInsnWrap
())
{
InsnNode
wrapInsn
=
((
InsnWrapArg
)
arg
).
getWrapInsn
();
...
...
jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInit3.java
0 → 100644
浏览文件 @
ed9fe8a5
package
jadx.tests.integration.others
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
public
class
TestFieldInit3
extends
IntegrationTest
{
public
static
class
TestCls
{
public
abstract
static
class
A
{
public
int
field
=
4
;
}
public
static
final
class
B
extends
A
{
public
B
()
{
// IPUT for A.field
super
.
field
=
7
;
}
}
public
static
final
class
C
extends
A
{
public
int
other
=
11
;
public
C
()
{
// IPUT for C.field not A.field !!!
this
.
field
=
9
;
}
}
public
static
final
class
D
extends
A
{
}
public
void
check
()
{
assertThat
(
new
B
().
field
,
is
(
7
));
assertThat
(
new
C
().
field
,
is
(
9
));
assertThat
(
new
C
().
other
,
is
(
11
));
assertThat
(
new
D
().
field
,
is
(
4
));
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"public int field = 4;"
));
assertThat
(
code
,
containsOne
(
"field = 7;"
));
assertThat
(
code
,
containsOne
(
"field = 9;"
));
assertThat
(
code
,
containsOne
(
"public int other = 11;"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录