Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colcode
jadx
提交
2b9c0927
J
jadx
项目概览
colcode
/
jadx
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
2b9c0927
编写于
8月 01, 2015
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix field initialization extract from try/catch block (fix #78)
上级
bc73010d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
118 addition
and
6 deletion
+118
-6
jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
+15
-0
jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
...rc/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
+16
-6
jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java
...adx/tests/integration/others/TestFieldInitInTryCatch.java
+87
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/nodes/InsnNode.java
浏览文件 @
2b9c0927
...
...
@@ -205,6 +205,21 @@ public class InsnNode extends LineAttrNode {
}
}
public
boolean
canReorderRecursive
()
{
if
(!
canReorder
())
{
return
false
;
}
for
(
InsnArg
arg
:
this
.
getArguments
())
{
if
(
arg
.
isInsnWrap
())
{
InsnNode
wrapInsn
=
((
InsnWrapArg
)
arg
).
getWrapInsn
();
if
(!
wrapInsn
.
canReorderRecursive
())
{
return
false
;
}
}
}
return
true
;
}
@Override
public
String
toString
()
{
return
InsnUtils
.
formatOffset
(
offset
)
+
": "
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/ExtractFieldInit.java
浏览文件 @
2b9c0927
...
...
@@ -6,6 +6,8 @@ import jadx.core.dex.info.AccessInfo;
import
jadx.core.dex.info.FieldInfo
;
import
jadx.core.dex.instructions.IndexInsnNode
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.instructions.args.InsnWrapArg
;
import
jadx.core.dex.instructions.args.RegisterArg
;
import
jadx.core.dex.nodes.BlockNode
;
import
jadx.core.dex.nodes.ClassNode
;
...
...
@@ -189,16 +191,24 @@ public class ExtractFieldInit extends AbstractVisitor {
}
private
static
boolean
checkInsn
(
InsnNode
insn
)
{
InsnArg
arg
=
insn
.
getArg
(
0
);
if
(
arg
.
isInsnWrap
())
{
InsnNode
wrapInsn
=
((
InsnWrapArg
)
arg
).
getWrapInsn
();
if
(!
wrapInsn
.
canReorderRecursive
()
&&
insn
.
contains
(
AType
.
CATCH_BLOCK
))
{
return
false
;
}
}
else
{
return
arg
.
isLiteral
()
||
arg
.
isThis
();
}
Set
<
RegisterArg
>
regs
=
new
HashSet
<
RegisterArg
>();
insn
.
getRegisterArgs
(
regs
);
if
(
regs
.
isEmpty
())
{
return
true
;
}
if
(!
regs
.
isEmpty
())
{
for
(
RegisterArg
reg
:
regs
)
{
if
(!
reg
.
isThis
())
{
return
false
;
}
}
}
return
true
;
}
...
...
jadx-core/src/test/java/jadx/tests/integration/others/TestFieldInitInTryCatch.java
0 → 100644
浏览文件 @
2b9c0927
package
jadx.tests.integration.others
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
java.net.MalformedURLException
;
import
java.net.URL
;
import
org.junit.Test
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsLines
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestFieldInitInTryCatch
extends
IntegrationTest
{
public
static
class
TestCls
{
private
static
final
URL
a
;
static
{
try
{
a
=
new
URL
(
"http://www.example.com/"
);
}
catch
(
MalformedURLException
e
)
{
throw
new
RuntimeException
(
e
);
}
}
}
public
static
class
TestCls2
{
private
static
final
URL
[]
a
;
static
{
try
{
a
=
new
URL
[]{
new
URL
(
"http://www.example.com/"
)};
}
catch
(
MalformedURLException
e
)
{
throw
new
RuntimeException
(
e
);
}
}
}
public
static
class
TestCls3
{
private
static
final
String
[]
a
;
static
{
try
{
a
=
new
String
[]{
"a"
};
// Note: follow code will not be extracted:
// a = new String[]{new String("a")};
new
URL
(
"http://www.example.com/"
);
}
catch
(
MalformedURLException
e
)
{
throw
new
RuntimeException
(
e
);
}
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"private static final URL a;"
));
assertThat
(
code
,
containsOne
(
"a = new URL(\"http://www.example.com/\");"
));
assertThat
(
code
,
containsLines
(
2
,
"try {"
,
indent
(
1
)
+
"a = new URL(\"http://www.example.com/\");"
,
"} catch (MalformedURLException e) {"
));
}
@Test
public
void
test2
()
{
ClassNode
cls
=
getClassNode
(
TestCls2
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsLines
(
2
,
"try {"
,
indent
(
1
)
+
"a = new URL[]{new URL(\"http://www.example.com/\")};"
,
"} catch (MalformedURLException e) {"
));
}
@Test
public
void
test3
()
{
ClassNode
cls
=
getClassNode
(
TestCls3
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"private static final String[] a = new String[]{\"a\"};"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录