Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
keyescgm
jadx
提交
b32dc17d
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,发现更多精彩内容 >>
提交
b32dc17d
编写于
7月 20, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: don't change AST before checks in ternary transform (#710)
上级
7c53b985
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
5 deletion
+47
-5
jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
.../main/java/jadx/core/dex/visitors/regions/TernaryMod.java
+4
-4
jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
+2
-1
jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatch.java
...adx/tests/integration/trycatch/TestTryWithEmptyCatch.java
+41
-0
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java
浏览文件 @
b32dc17d
...
...
@@ -253,10 +253,6 @@ public class TernaryMod implements IRegionIterativeVisitor {
}
private
static
void
replaceWithTernary
(
MethodNode
mth
,
IfRegion
ifRegion
,
BlockNode
block
,
InsnNode
insn
)
{
BlockNode
header
=
ifRegion
.
getConditionBlocks
().
get
(
0
);
if
(!
ifRegion
.
getParent
().
replaceSubBlock
(
ifRegion
,
header
))
{
return
;
}
RegisterArg
resArg
=
insn
.
getResult
();
if
(
resArg
.
getSVar
().
getUseList
().
size
()
!=
1
)
{
return
;
...
...
@@ -277,6 +273,10 @@ public class TernaryMod implements IRegionIterativeVisitor {
}
// all checks passed
BlockNode
header
=
ifRegion
.
getConditionBlocks
().
get
(
0
);
if
(!
ifRegion
.
getParent
().
replaceSubBlock
(
ifRegion
,
header
))
{
return
;
}
InsnList
.
remove
(
block
,
insn
);
TernaryInsn
ternInsn
=
new
TernaryInsn
(
ifRegion
.
getCondition
(),
phiInsn
.
getResult
(),
InsnArg
.
wrapInsnIntoArg
(
insn
),
otherArg
);
...
...
jadx-core/src/main/java/jadx/core/utils/DebugUtils.java
浏览文件 @
b32dc17d
...
...
@@ -119,7 +119,8 @@ public class DebugUtils {
CodeWriter
code
=
new
CodeWriter
();
ig
.
makeInsn
(
insn
,
code
);
String
insnStr
=
code
.
toString
().
substring
(
CodeWriter
.
NL
.
length
());
LOG
.
debug
(
"{}|> {}\t{}"
,
indent
,
insnStr
,
insn
.
getAttributesString
());
String
attrStr
=
insn
.
isAttrStorageEmpty
()
?
""
:
'\t'
+
insn
.
getAttributesString
();
LOG
.
debug
(
"{}|> {}{}"
,
indent
,
insnStr
,
attrStr
);
}
catch
(
CodegenException
e
)
{
LOG
.
debug
(
"{}|>!! {}"
,
indent
,
insn
);
}
...
...
jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryWithEmptyCatch.java
0 → 100644
浏览文件 @
b32dc17d
package
jadx.tests.integration.trycatch
;
import
java.util.Properties
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
public
class
TestTryWithEmptyCatch
extends
IntegrationTest
{
public
static
class
TestCls
extends
Exception
{
private
static
final
long
serialVersionUID
=
-
5723049816464070603L
;
private
Properties
field
;
public
TestCls
(
String
str
)
{
super
(
str
);
Properties
properties
=
null
;
try
{
if
(
str
.
contains
(
"properties"
))
{
properties
=
new
Properties
();
}
}
catch
(
Exception
unused
)
{
// empty
}
this
.
field
=
properties
;
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"try {"
));
assertThat
(
code
,
containsOne
(
"if ("
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录