Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colcode
jadx
提交
04e309ae
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,发现更多精彩内容 >>
提交
04e309ae
编写于
12月 27, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: additional checks for 'if' blocks inside loops (#809)
上级
99eb31b3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
112 addition
and
1 deletion
+112
-1
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+3
-1
jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
...in/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
+7
-0
jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
+22
-0
jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak2.java
.../java/jadx/tests/integration/loops/TestDoWhileBreak2.java
+47
-0
jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak3.java
.../java/jadx/tests/integration/loops/TestDoWhileBreak3.java
+33
-0
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
浏览文件 @
04e309ae
...
...
@@ -467,7 +467,9 @@ public class InsnGen {
case
MONITOR_EXIT:
if
(
isFallback
())
{
code
.
add
(
"monitor-exit("
);
addArg
(
code
,
insn
.
getArg
(
0
));
if
(
insn
.
getArgsCount
()
==
1
)
{
addArg
(
code
,
insn
.
getArg
(
0
));
}
code
.
add
(
')'
);
}
break
;
...
...
jadx-core/src/main/java/jadx/core/dex/visitors/regions/IfMakerHelper.java
浏览文件 @
04e309ae
...
...
@@ -155,6 +155,10 @@ public class IfMakerHelper {
if
(
curThen
==
curElse
)
{
return
null
;
}
if
(
BlockUtils
.
isFollowBackEdge
(
curThen
)
||
BlockUtils
.
isFollowBackEdge
(
curElse
))
{
return
null
;
}
boolean
followThenBranch
;
IfInfo
nextIf
=
getNextIf
(
currentIf
,
curThen
);
if
(
nextIf
!=
null
)
{
...
...
@@ -380,6 +384,9 @@ public class IfMakerHelper {
if
(
next
.
getPredecessors
().
size
()
!=
1
)
{
return
null
;
}
if
(
next
.
contains
(
AFlag
.
ADDED_TO_REGION
))
{
return
null
;
}
List
<
InsnNode
>
insns
=
block
.
getInstructions
();
boolean
pass
=
true
;
List
<
InsnNode
>
forceInlineInsns
=
new
ArrayList
<>();
...
...
jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
浏览文件 @
04e309ae
...
...
@@ -14,6 +14,7 @@ import org.jetbrains.annotations.Nullable;
import
jadx.core.dex.attributes.AFlag
;
import
jadx.core.dex.attributes.AType
;
import
jadx.core.dex.attributes.nodes.IgnoreEdgeAttr
;
import
jadx.core.dex.attributes.nodes.LoopInfo
;
import
jadx.core.dex.attributes.nodes.PhiListAttr
;
import
jadx.core.dex.instructions.IfNode
;
import
jadx.core.dex.instructions.InsnType
;
...
...
@@ -137,6 +138,27 @@ public class BlockUtils {
return
from
.
getSuccessors
().
contains
(
to
);
}
public
static
boolean
isFollowBackEdge
(
BlockNode
block
)
{
if
(
block
==
null
)
{
return
false
;
}
if
(
block
.
contains
(
AFlag
.
LOOP_START
))
{
List
<
BlockNode
>
predecessors
=
block
.
getPredecessors
();
if
(
predecessors
.
size
()
==
1
)
{
BlockNode
loopEndBlock
=
predecessors
.
get
(
0
);
if
(
loopEndBlock
.
contains
(
AFlag
.
LOOP_END
))
{
List
<
LoopInfo
>
loops
=
loopEndBlock
.
getAll
(
AType
.
LOOP
);
for
(
LoopInfo
loop
:
loops
)
{
if
(
loop
.
getStart
().
equals
(
block
)
&&
loop
.
getEnd
().
equals
(
loopEndBlock
))
{
return
true
;
}
}
}
}
}
return
false
;
}
/**
* Check if instruction contains in block (use == for comparison, not equals)
*/
...
...
jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak2.java
0 → 100644
浏览文件 @
04e309ae
package
jadx.tests.integration.loops
;
import
java.util.Arrays
;
import
java.util.Iterator
;
import
org.junit.jupiter.api.Test
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestDoWhileBreak2
extends
IntegrationTest
{
public
static
class
TestCls
{
Iterator
<
String
>
it
;
@SuppressWarnings
(
"ConstantConditions"
)
public
Object
test
()
{
String
obj
;
do
{
obj
=
this
.
it
.
next
();
if
(
obj
==
null
)
{
return
obj
;
// 'return null' works
}
}
while
(
this
.
it
.
hasNext
());
return
obj
;
}
public
void
check
()
{
this
.
it
=
Arrays
.
asList
(
"a"
,
"b"
).
iterator
();
assertThat
(
test
()).
isEqualTo
(
"b"
);
this
.
it
=
Arrays
.
asList
(
"a"
,
"b"
,
null
).
iterator
();
assertThat
(
test
()).
isEqualTo
(
null
);
}
}
@Test
public
void
test
()
{
assertThat
(
getClassNode
(
TestCls
.
class
))
.
code
()
.
containsLine
(
2
,
"do {"
)
.
containsLine
(
3
,
"obj = this.it.next();"
)
.
containsLine
(
3
,
"if (obj == null) {"
)
.
containsLine
(
2
,
"} while (this.it.hasNext());"
);
}
}
jadx-core/src/test/java/jadx/tests/integration/loops/TestDoWhileBreak3.java
0 → 100644
浏览文件 @
04e309ae
package
jadx.tests.integration.loops
;
import
java.util.Iterator
;
import
org.junit.jupiter.api.Test
;
import
jadx.NotYetImplemented
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
assertj
.
JadxAssertions
.
assertThat
;
public
class
TestDoWhileBreak3
extends
IntegrationTest
{
public
static
class
TestCls
{
Iterator
<
String
>
it
;
public
void
test
()
{
do
{
if
(!
it
.
hasNext
())
{
break
;
}
}
while
(
it
.
next
()
!=
null
);
}
}
@NotYetImplemented
@Test
public
void
test
()
{
assertThat
(
getClassNode
(
TestCls
.
class
))
.
code
()
.
containsOnlyOnce
(
"while"
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录