Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
58998089
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,发现更多精彩内容 >>
提交
58998089
编写于
8月 07, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: redone 'if' structure checking
上级
f0a73b32
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
65 addition
and
18 deletion
+65
-18
jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
...in/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
+8
-18
jadx-core/src/test/java/jadx/tests/internal/others/TestIfInTry.java
...src/test/java/jadx/tests/internal/others/TestIfInTry.java
+57
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
浏览文件 @
58998089
...
...
@@ -50,26 +50,16 @@ public class IfMakerHelper {
boolean
badThen
=
!
allPathsFromIf
(
thenBlock
,
info
);
boolean
badElse
=
!
allPathsFromIf
(
elseBlock
,
info
);
if
(
badThen
&&
badElse
)
{
LOG
.
debug
(
"Stop processing blocks after 'if': {}, method: {}"
,
info
,
mth
);
return
null
;
}
if
(
badThen
||
badElse
)
{
if
(
badElse
&&
isPathExists
(
thenBlock
,
elseBlock
))
{
info
=
new
IfInfo
(
info
.
getCondition
(),
thenBlock
,
null
);
info
.
setOutBlock
(
elseBlock
);
}
else
if
(
badThen
&&
isPathExists
(
elseBlock
,
thenBlock
))
{
info
=
IfInfo
.
invert
(
info
);
info
=
new
IfInfo
(
info
.
getCondition
(),
info
.
getThenBlock
(),
null
);
info
.
setOutBlock
(
thenBlock
);
}
else
if
(
badElse
)
{
info
=
new
IfInfo
(
info
.
getCondition
(),
thenBlock
,
null
);
info
.
setOutBlock
(
null
);
LOG
.
debug
(
"Stop processing blocks after bad 'else' in 'if': {}, method: {}"
,
info
,
mth
);
}
else
{
info
=
IfInfo
.
invert
(
info
);
info
=
new
IfInfo
(
info
.
getCondition
(),
info
.
getThenBlock
(),
null
);
info
.
setOutBlock
(
null
);
LOG
.
debug
(
"Stop processing blocks after bad 'then' in 'if': {}, method: {}"
,
info
,
mth
);
}
if
(
badElse
)
{
info
=
new
IfInfo
(
info
.
getCondition
(),
thenBlock
,
null
);
info
.
setOutBlock
(
elseBlock
);
}
else
if
(
badThen
)
{
info
=
IfInfo
.
invert
(
info
);
info
=
new
IfInfo
(
info
.
getCondition
(),
elseBlock
,
null
);
info
.
setOutBlock
(
thenBlock
);
}
else
{
List
<
BlockNode
>
thenSC
=
thenBlock
.
getCleanSuccessors
();
List
<
BlockNode
>
elseSC
=
elseBlock
.
getCleanSuccessors
();
...
...
jadx-core/src/test/java/jadx/tests/internal/others/TestIfInTry.java
0 → 100644
浏览文件 @
58998089
package
jadx.tests.internal.others
;
import
jadx.api.InternalJadxTest
;
import
jadx.core.dex.nodes.ClassNode
;
import
java.io.File
;
import
java.io.IOException
;
import
org.junit.Test
;
import
static
jadx
.
tests
.
utils
.
JadxMatchers
.
containsOne
;
import
static
jadx
.
tests
.
utils
.
JadxMatchers
.
countString
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestIfInTry
extends
InternalJadxTest
{
public
static
class
TestCls
{
private
File
dir
;
public
int
test
()
{
try
{
int
a
=
f
();
if
(
a
!=
0
)
{
return
a
;
}
}
catch
(
Exception
e
)
{
// skip
}
try
{
f
();
return
1
;
}
catch
(
IOException
e
)
{
return
-
1
;
}
}
private
int
f
()
throws
IOException
{
return
0
;
}
}
@Test
public
void
test
()
{
setOutputCFG
();
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
System
.
out
.
println
(
code
);
assertThat
(
code
,
containsOne
(
"if (a != 0) {"
));
assertThat
(
code
,
containsOne
(
"} catch (Exception e) {"
));
assertThat
(
code
,
countString
(
2
,
"try {"
));
assertThat
(
code
,
countString
(
3
,
"f()"
));
assertThat
(
code
,
containsOne
(
"return 1;"
));
assertThat
(
code
,
containsOne
(
"} catch (IOException e"
));
assertThat
(
code
,
containsOne
(
"return -1;"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录