Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
3f25f072
J
jadx
项目概览
keyescgm
/
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,发现更多精彩内容 >>
未验证
提交
3f25f072
编写于
12月 03, 2020
作者:
J
Jonas Konrad
提交者:
GitHub
12月 03, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: properly traverse methods with synchronize blocks that have no clear exit (PR #1041)
上级
5c75f249
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
84 addition
and
2 deletion
+84
-2
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
...main/java/jadx/core/dex/visitors/regions/RegionMaker.java
+2
-0
jadx-core/src/test/java/jadx/tests/integration/loops/TestSynchronizedInEndlessLoop.java
...ests/integration/loops/TestSynchronizedInEndlessLoop.java
+0
-2
jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized5.java
...jadx/tests/integration/synchronize/TestSynchronized5.java
+20
-0
jadx-core/src/test/smali/synchronize/TestSynchronized5.smali
jadx-core/src/test/smali/synchronize/TestSynchronized5.smali
+62
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
浏览文件 @
3f25f072
...
@@ -594,6 +594,8 @@ public class RegionMaker {
...
@@ -594,6 +594,8 @@ public class RegionMaker {
List
<
BlockNode
>
list
=
BlockUtils
.
buildSimplePath
(
exitBlock
);
List
<
BlockNode
>
list
=
BlockUtils
.
buildSimplePath
(
exitBlock
);
if
(
list
.
isEmpty
()
||
!
list
.
get
(
list
.
size
()
-
1
).
getSuccessors
().
isEmpty
())
{
if
(
list
.
isEmpty
()
||
!
list
.
get
(
list
.
size
()
-
1
).
getSuccessors
().
isEmpty
())
{
stack
.
addExit
(
exitBlock
);
stack
.
addExit
(
exitBlock
);
// we can still try using this as an exit block to make sure it's visited.
exit
=
exitBlock
;
}
}
}
}
}
}
...
...
jadx-core/src/test/java/jadx/tests/integration/loops/TestSynchronizedInEndlessLoop.java
浏览文件 @
3f25f072
...
@@ -2,7 +2,6 @@ package jadx.tests.integration.loops;
...
@@ -2,7 +2,6 @@ package jadx.tests.integration.loops;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
jadx.NotYetImplemented
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
jadx.tests.api.IntegrationTest
;
...
@@ -34,7 +33,6 @@ public class TestSynchronizedInEndlessLoop extends IntegrationTest {
...
@@ -34,7 +33,6 @@ public class TestSynchronizedInEndlessLoop extends IntegrationTest {
}
}
@Test
@Test
@NotYetImplemented
public
void
test
()
{
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
String
code
=
cls
.
getCode
().
toString
();
...
...
jadx-core/src/test/java/jadx/tests/integration/synchronize/TestSynchronized5.java
0 → 100644
浏览文件 @
3f25f072
package
jadx.tests.integration.synchronize
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.SmaliTest
;
import
static
org
.
hamcrest
.
CoreMatchers
.
containsString
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
public
class
TestSynchronized5
extends
SmaliTest
{
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNodeFromSmali
();
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsString
(
"1 != 0"
));
assertThat
(
code
,
containsString
(
"System.gc();"
));
}
}
jadx-core/src/test/smali/synchronize/TestSynchronized5.smali
0 → 100644
浏览文件 @
3f25f072
.class public Lsynchronize/TestSynchronized5;
.super Ljava/lang/Object;
.method public final get()V
.registers 6
monitor-enter p0
:try_start_1
const/4 v0, 0
if-eqz v0, :cond_1
monitor-exit p0
return-void
:cond_1
monitor-exit p0
:try_end_1
.catchall {:try_start_1 .. :try_end_1} :catchall_1
monitor-enter p0
:try_start_2
const/4 v1, 1
if-eqz v1, :cond_2
invoke-static {}, Ljava/lang/System;->gc()V
:cond_2
monitor-exit p0
:try_end_2
.catchall {:try_start_2 .. :try_end_2} :catchall_2
return-void
:catchall_2
move-exception v0
:try_start_3
monitor-exit p0
:try_end_3
.catchall {:try_start_3 .. :try_end_3} :catchall_2
throw v0
:catchall_1
move-exception v0
:try_start_4
monitor-exit p0
:try_end_4
.catchall {:try_start_4 .. :try_end_4} :catchall_1
throw v0
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录