Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colcode
jadx
提交
b2f0f025
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,发现更多精彩内容 >>
提交
b2f0f025
编写于
6月 26, 2015
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix incorrectly removed 'return' in 'switch' block (fix #70)
上级
71f24911
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
69 addition
and
1 deletion
+69
-1
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
+2
-0
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
...main/java/jadx/core/dex/visitors/regions/RegionMaker.java
+4
-1
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ReturnVisitor.java
...in/java/jadx/core/dex/visitors/regions/ReturnVisitor.java
+8
-0
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch3.java
...est/java/jadx/tests/integration/switches/TestSwitch3.java
+55
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/nodes/MethodNode.java
浏览文件 @
b2f0f025
...
...
@@ -35,6 +35,7 @@ import java.util.Map;
import
java.util.Set
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -442,6 +443,7 @@ public class MethodNode extends LineAttrNode implements ILoadable {
loops
.
add
(
loop
);
}
@Nullable
public
LoopInfo
getLoopForBlock
(
BlockNode
block
)
{
if
(
loops
.
isEmpty
())
{
return
null
;
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
浏览文件 @
b2f0f025
...
...
@@ -30,6 +30,7 @@ import jadx.core.utils.ErrorsCounter;
import
jadx.core.utils.InstructionRemover
;
import
jadx.core.utils.RegionUtils
;
import
jadx.core.utils.exceptions.JadxOverflowException
;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
import
java.util.ArrayList
;
import
java.util.BitSet
;
...
...
@@ -690,7 +691,9 @@ public class RegionMaker {
Map
<
BlockNode
,
List
<
Object
>>
blocksMap
=
new
LinkedHashMap
<
BlockNode
,
List
<
Object
>>(
len
);
for
(
Map
.
Entry
<
Integer
,
List
<
Object
>>
entry
:
casesMap
.
entrySet
())
{
BlockNode
c
=
getBlockByOffset
(
entry
.
getKey
(),
block
.
getSuccessors
());
assert
c
!=
null
;
if
(
c
==
null
)
{
throw
new
JadxRuntimeException
(
"Switch block not found by offset: "
+
entry
.
getKey
());
}
blocksMap
.
put
(
c
,
entry
.
getValue
());
}
BlockNode
defCase
=
getBlockByOffset
(
insn
.
getDefaultCaseOffset
(),
block
.
getSuccessors
());
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ReturnVisitor.java
浏览文件 @
b2f0f025
...
...
@@ -9,6 +9,7 @@ import jadx.core.dex.nodes.IContainer;
import
jadx.core.dex.nodes.IRegion
;
import
jadx.core.dex.nodes.InsnNode
;
import
jadx.core.dex.nodes.MethodNode
;
import
jadx.core.dex.regions.SwitchRegion
;
import
jadx.core.dex.regions.loops.LoopRegion
;
import
jadx.core.dex.visitors.AbstractVisitor
;
import
jadx.core.utils.exceptions.JadxException
;
...
...
@@ -31,6 +32,13 @@ public class ReturnVisitor extends AbstractVisitor {
}
private
static
final
class
ReturnRemoverVisitor
extends
TracedRegionVisitor
{
@Override
public
boolean
enterRegion
(
MethodNode
mth
,
IRegion
region
)
{
super
.
enterRegion
(
mth
,
region
);
return
!(
region
instanceof
SwitchRegion
);
}
@Override
public
void
processBlockTraced
(
MethodNode
mth
,
IBlock
container
,
IRegion
currentRegion
)
{
if
(
container
.
getClass
()
!=
BlockNode
.
class
)
{
...
...
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitch3.java
0 → 100644
浏览文件 @
b2f0f025
package
jadx.tests.integration.switches
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
org.junit.Test
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
countString
;
import
static
org
.
hamcrest
.
Matchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestSwitch3
extends
IntegrationTest
{
public
static
class
TestCls
{
private
int
i
;
void
test
(
int
a
)
{
switch
(
a
)
{
case
1
:
i
=
1
;
return
;
case
2
:
case
3
:
i
=
2
;
return
;
default
:
i
=
4
;
break
;
}
i
=
5
;
}
public
void
check
()
{
test
(
1
);
assertThat
(
i
,
is
(
1
));
test
(
2
);
assertThat
(
i
,
is
(
2
));
test
(
3
);
assertThat
(
i
,
is
(
2
));
test
(
4
);
assertThat
(
i
,
is
(
5
));
test
(
10
);
assertThat
(
i
,
is
(
5
));
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
countString
(
0
,
"break;"
));
assertThat
(
code
,
countString
(
3
,
"return;"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录