Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Quincy379
jadx
提交
41abbb12
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,发现更多精彩内容 >>
提交
41abbb12
编写于
4月 22, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: resolve check cast exception in string constructor simplify
上级
89b80900
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
53 addition
and
37 deletion
+53
-37
jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
...src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
+40
-37
jadx-core/src/test/java/jadx/tests/integration/others/TestStringConstructor.java
.../jadx/tests/integration/others/TestStringConstructor.java
+13
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
浏览文件 @
41abbb12
...
...
@@ -17,6 +17,7 @@ import jadx.core.dex.instructions.ArithNode;
import
jadx.core.dex.instructions.ArithOp
;
import
jadx.core.dex.instructions.CallMthInterface
;
import
jadx.core.dex.instructions.ConstStringNode
;
import
jadx.core.dex.instructions.FilledNewArrayNode
;
import
jadx.core.dex.instructions.IfNode
;
import
jadx.core.dex.instructions.IndexInsnNode
;
import
jadx.core.dex.instructions.InsnType
;
...
...
@@ -124,7 +125,7 @@ public class SimplifyVisitor extends AbstractVisitor {
break
;
case
CONSTRUCTOR:
simpl
fy
Constructor
(
mth
.
root
(),
(
ConstructorInsn
)
insn
);
simpl
ifyString
Constructor
(
mth
.
root
(),
(
ConstructorInsn
)
insn
);
break
;
default
:
...
...
@@ -133,42 +134,44 @@ public class SimplifyVisitor extends AbstractVisitor {
return
null
;
}
private
static
void
simplfyConstructor
(
RootNode
root
,
ConstructorInsn
insn
)
{
if
(
insn
.
getArgsCount
()
!=
0
&&
insn
.
getCallMth
().
getDeclClass
().
getType
().
equals
(
ArgType
.
STRING
))
{
InsnArg
arg
=
insn
.
getArg
(
0
);
InsnNode
node
=
arg
.
isInsnWrap
()
?
((
InsnWrapArg
)
arg
).
getWrapInsn
()
:
insn
;
if
(
node
.
getArgsCount
()
!=
0
)
{
ArgType
argType
=
node
.
getArg
(
0
).
getType
();
if
(
node
.
getType
()
==
InsnType
.
FILLED_NEW_ARRAY
&&
(
argType
==
ArgType
.
BYTE
||
argType
==
ArgType
.
CHAR
))
{
int
printable
=
0
;
byte
[]
arr
=
new
byte
[
node
.
getArgsCount
()];
for
(
int
i
=
0
;
i
<
arr
.
length
;
i
++)
{
arr
[
i
]
=
(
byte
)
((
LiteralArg
)
node
.
getArg
(
i
)).
getLiteral
();
if
(
NameMapper
.
isPrintableChar
(
arr
[
i
]))
{
printable
++;
}
}
if
(
printable
>=
arr
.
length
-
printable
)
{
InsnWrapArg
wa
=
new
InsnWrapArg
(
new
ConstStringNode
(
new
String
(
arr
)));
if
(
insn
.
getArgsCount
()
==
1
)
{
insn
.
setArg
(
0
,
wa
);
}
else
{
MethodInfo
mi
=
MethodInfo
.
externalMth
(
ClassInfo
.
fromType
(
root
,
ArgType
.
STRING
),
"getBytes"
,
Collections
.
emptyList
(),
ArgType
.
array
(
ArgType
.
BYTE
));
InvokeNode
in
=
new
InvokeNode
(
mi
,
InvokeType
.
VIRTUAL
,
1
);
in
.
addArg
(
wa
);
insn
.
setArg
(
0
,
new
InsnWrapArg
(
in
));
}
}
}
}
private
static
void
simplifyStringConstructor
(
RootNode
root
,
ConstructorInsn
insn
)
{
if
(
insn
.
getCallMth
().
getDeclClass
().
getType
().
equals
(
ArgType
.
STRING
)
&&
insn
.
getArgsCount
()
!=
0
&&
insn
.
getArg
(
0
).
isInsnWrap
())
{
InsnNode
arrInsn
=
((
InsnWrapArg
)
insn
.
getArg
(
0
)).
getWrapInsn
();
if
(
arrInsn
.
getType
()
==
InsnType
.
FILLED_NEW_ARRAY
&&
arrInsn
.
getArgsCount
()
!=
0
)
{
ArgType
elemType
=
((
FilledNewArrayNode
)
arrInsn
).
getElemType
();
if
(
elemType
==
ArgType
.
BYTE
||
elemType
==
ArgType
.
CHAR
)
{
int
printable
=
0
;
byte
[]
arr
=
new
byte
[
arrInsn
.
getArgsCount
()];
for
(
int
i
=
0
;
i
<
arr
.
length
;
i
++)
{
InsnArg
arrArg
=
arrInsn
.
getArg
(
i
);
if
(!
arrArg
.
isLiteral
())
{
return
;
}
arr
[
i
]
=
(
byte
)
((
LiteralArg
)
arrArg
).
getLiteral
();
if
(
NameMapper
.
isPrintableChar
(
arr
[
i
]))
{
printable
++;
}
}
if
(
printable
>=
arr
.
length
-
printable
)
{
InsnWrapArg
wa
=
new
InsnWrapArg
(
new
ConstStringNode
(
new
String
(
arr
)));
if
(
insn
.
getArgsCount
()
==
1
)
{
insn
.
setArg
(
0
,
wa
);
}
else
{
MethodInfo
mi
=
MethodInfo
.
externalMth
(
ClassInfo
.
fromType
(
root
,
ArgType
.
STRING
),
"getBytes"
,
Collections
.
emptyList
(),
ArgType
.
array
(
ArgType
.
BYTE
));
InvokeNode
in
=
new
InvokeNode
(
mi
,
InvokeType
.
VIRTUAL
,
1
);
in
.
addArg
(
wa
);
insn
.
setArg
(
0
,
new
InsnWrapArg
(
in
));
}
}
}
}
}
}
...
...
jadx-core/src/test/java/jadx/tests/integration/others/TestStringConstructor.java
浏览文件 @
41abbb12
...
...
@@ -83,4 +83,17 @@ public class TestStringConstructor extends IntegrationTest {
assertThat
(
code
,
containsOne
(
"tag = new String();"
));
}
public
static
class
TestClsNegative2
{
public
byte
b
=
32
;
public
String
tag
=
new
String
(
new
byte
[]
{
31
,
b
});
}
@Test
public
void
testNegative2
()
{
ClassNode
cls
=
getClassNode
(
TestClsNegative2
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"tag = new String(new byte[]{31, this.b});"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录