Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
ca448fc4
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,体验更适合开发者的 AI 搜索 >>
提交
ca448fc4
编写于
3月 10, 2014
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix variable definitions for 'try' blocks
上级
7a51c0d0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
9 deletion
+28
-9
jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java
...e/src/main/java/jadx/core/dex/regions/AbstractRegion.java
+4
-1
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
...adx/core/dex/visitors/regions/ProcessTryCatchRegions.java
+9
-0
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessVariables.java
...java/jadx/core/dex/visitors/regions/ProcessVariables.java
+1
-1
jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java
...st/java/jadx/tests/internal/TestVariablesDefinitions.java
+14
-7
未找到文件。
jadx-core/src/main/java/jadx/core/dex/regions/AbstractRegion.java
浏览文件 @
ca448fc4
...
...
@@ -5,7 +5,7 @@ import jadx.core.dex.nodes.IRegion;
public
abstract
class
AbstractRegion
extends
AttrNode
implements
IRegion
{
private
final
IRegion
parent
;
private
IRegion
parent
;
public
AbstractRegion
(
IRegion
parent
)
{
this
.
parent
=
parent
;
...
...
@@ -16,4 +16,7 @@ public abstract class AbstractRegion extends AttrNode implements IRegion {
return
parent
;
}
public
void
setParent
(
IRegion
parent
)
{
this
.
parent
=
parent
;
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
浏览文件 @
ca448fc4
...
...
@@ -5,6 +5,7 @@ import jadx.core.dex.nodes.BlockNode;
import
jadx.core.dex.nodes.IContainer
;
import
jadx.core.dex.nodes.IRegion
;
import
jadx.core.dex.nodes.MethodNode
;
import
jadx.core.dex.regions.AbstractRegion
;
import
jadx.core.dex.regions.Region
;
import
jadx.core.dex.trycatch.CatchAttr
;
import
jadx.core.dex.trycatch.ExceptionHandler
;
...
...
@@ -144,6 +145,14 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
region
.
getSubBlocks
().
removeAll
(
newRegion
.
getSubBlocks
());
newRegion
.
getAttributes
().
add
(
tb
.
getCatchAttr
());
// fix parents
for
(
IContainer
cont
:
newRegion
.
getSubBlocks
())
{
if
(
cont
instanceof
AbstractRegion
)
{
AbstractRegion
aReg
=
(
AbstractRegion
)
cont
;
aReg
.
setParent
(
newRegion
);
}
}
}
}
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessVariables.java
浏览文件 @
ca448fc4
...
...
@@ -60,7 +60,7 @@ public class ProcessVariables extends AbstractVisitor {
@Override
public
String
toString
()
{
return
arg
+
"
"
+
assigns
+
"
"
+
usage
;
return
arg
+
"
, a:"
+
assigns
+
", u:
"
+
usage
;
}
}
...
...
jadx-core/src/test/java/jadx/tests/internal/TestVariablesDefinitions.java
浏览文件 @
ca448fc4
...
...
@@ -6,10 +6,16 @@ import jadx.core.dex.visitors.DepthTraverser;
import
jadx.core.dex.visitors.IDexTreeVisitor
;
import
jadx.core.utils.exceptions.DecodeException
;
import
java.util.Iterator
;
import
java.util.List
;
import
org.junit.Test
;
import
org.slf4j.Logger
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
CoreMatchers
.
not
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestVariablesDefinitions
extends
InternalJadxTest
{
public
static
class
TestCls
{
...
...
@@ -20,23 +26,24 @@ public class TestVariablesDefinitions extends InternalJadxTest {
public
void
run
()
{
try
{
cls
.
load
();
for
(
IDexTreeVisitor
visitor
:
passes
)
{
DepthTraverser
.
visit
(
visitor
,
cls
);
Iterator
<
IDexTreeVisitor
>
iterator
=
passes
.
iterator
();
while
(
iterator
.
hasNext
())
{
DepthTraverser
.
visit
(
iterator
.
next
(),
cls
);
}
}
catch
(
DecodeException
e
)
{
LOG
.
error
(
"Decode exception: "
+
cls
,
e
);
}
finally
{
cls
.
unload
();
}
}
}
//
@Test
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
System
.
out
.
println
(
code
);
// 'iterator' variable must be declared inside 'try' block
assertThat
(
code
,
containsString
(
makeIndent
(
3
)
+
"Iterator<IDexTreeVisitor> iterator = "
));
assertThat
(
code
,
not
(
containsString
(
"iterator;"
)));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录