Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
41cc83db
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,发现更多精彩内容 >>
提交
41cc83db
编写于
7月 06, 2014
作者:
F
fruiter
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix nested try-catch blocks processing
上级
ce7101be
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
52 addition
and
5 deletion
+52
-5
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
...adx/core/dex/visitors/regions/ProcessTryCatchRegions.java
+11
-5
jadx-core/src/test/java/jadx/tests/internal/trycatch/TestNestedTryCatch.java
...java/jadx/tests/internal/trycatch/TestNestedTryCatch.java
+41
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
浏览文件 @
41cc83db
...
@@ -101,10 +101,14 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
...
@@ -101,10 +101,14 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
// search dominator blocks in this region (don't need to go deeper)
// search dominator blocks in this region (don't need to go deeper)
for
(
BlockNode
dominator
:
tryBlocksMap
.
keySet
())
{
for
(
BlockNode
dominator
:
tryBlocksMap
.
keySet
())
{
if
(
region
.
getSubBlocks
().
contains
(
dominator
))
{
if
(
region
.
getSubBlocks
().
contains
(
dominator
))
{
wrapBlocks
(
region
,
dominator
);
Region
newRegion
=
wrapBlocks
(
region
,
dominator
);
tryBlocksMap
.
remove
(
dominator
);
tryBlocksMap
.
remove
(
dominator
);
if
(
newRegion
!=
null
)
{
// dominator may be moved into new region
leaveRegion
(
mth
,
newRegion
);
// if region is modified rerun this method
// if region is modified rerun this method
leaveRegion
(
mth
,
region
);
leaveRegion
(
mth
,
region
);
}
return
;
return
;
}
}
}
}
...
@@ -113,7 +117,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
...
@@ -113,7 +117,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
/**
/**
* Extract all block dominated by 'dominator' to separate region and mark as try/catch block
* Extract all block dominated by 'dominator' to separate region and mark as try/catch block
*/
*/
private
void
wrapBlocks
(
IRegion
region
,
BlockNode
dominator
)
{
private
Region
wrapBlocks
(
IRegion
region
,
BlockNode
dominator
)
{
Region
newRegion
=
new
Region
(
region
);
Region
newRegion
=
new
Region
(
region
);
TryCatchBlock
tb
=
tryBlocksMap
.
get
(
dominator
);
TryCatchBlock
tb
=
tryBlocksMap
.
get
(
dominator
);
assert
tb
!=
null
;
assert
tb
!=
null
;
...
@@ -127,7 +131,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
...
@@ -127,7 +131,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
}
}
}
}
if
(
newRegion
.
getSubBlocks
().
isEmpty
())
{
if
(
newRegion
.
getSubBlocks
().
isEmpty
())
{
return
;
return
null
;
}
}
if
(
DEBUG
)
{
if
(
DEBUG
)
{
LOG
.
debug
(
"ProcessTryCatchRegions mark: {}"
,
newRegion
);
LOG
.
debug
(
"ProcessTryCatchRegions mark: {}"
,
newRegion
);
...
@@ -147,6 +151,8 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
...
@@ -147,6 +151,8 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
aReg
.
setParent
(
newRegion
);
aReg
.
setParent
(
newRegion
);
}
}
}
}
return
newRegion
;
}
}
private
boolean
isHandlerPath
(
TryCatchBlock
tb
,
IContainer
cont
)
{
private
boolean
isHandlerPath
(
TryCatchBlock
tb
,
IContainer
cont
)
{
...
...
jadx-core/src/test/java/jadx/tests/internal/trycatch/TestNestedTryCatch.java
0 → 100644
浏览文件 @
41cc83db
package
jadx.tests.internal.trycatch
;
import
jadx.api.InternalJadxTest
;
import
jadx.core.dex.nodes.ClassNode
;
import
org.junit.Test
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
CoreMatchers
.
not
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestNestedTryCatch
extends
InternalJadxTest
{
public
static
class
TestCls
{
private
void
f
()
{
try
{
Thread
.
sleep
(
1
);
try
{
Thread
.
sleep
(
2
);
}
catch
(
InterruptedException
e
)
{
}
}
catch
(
Exception
e
)
{
}
return
;
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
"try {"
));
assertThat
(
code
,
containsString
(
"Thread.sleep(1);"
));
assertThat
(
code
,
containsString
(
"Thread.sleep(2);"
));
assertThat
(
code
,
containsString
(
"} catch (InterruptedException e) {"
));
assertThat
(
code
,
containsString
(
"} catch (Exception e2) {"
));
assertThat
(
code
,
not
(
containsString
(
"return"
)));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录