Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
7d983f28
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,发现更多精彩内容 >>
提交
7d983f28
编写于
6月 16, 2018
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: fix catch block argument if move-exception instruction is missing (#295)
上级
3b2b5417
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
12 deletion
+22
-12
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockExceptionHandler.java
.../core/dex/visitors/blocksmaker/BlockExceptionHandler.java
+21
-10
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
...adx/core/dex/visitors/regions/ProcessTryCatchRegions.java
+1
-2
未找到文件。
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockExceptionHandler.java
浏览文件 @
7d983f28
package
jadx.core.dex.visitors.blocksmaker
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
jadx.core.dex.attributes.AFlag
;
import
jadx.core.dex.attributes.AType
;
import
jadx.core.dex.instructions.InsnType
;
import
jadx.core.dex.instructions.args.ArgType
;
import
jadx.core.dex.instructions.args.InsnArg
;
import
jadx.core.dex.instructions.args.NamedArg
;
import
jadx.core.dex.instructions.args.RegisterArg
;
import
jadx.core.dex.nodes.BlockNode
;
import
jadx.core.dex.nodes.InsnNode
;
...
...
@@ -19,6 +23,8 @@ import jadx.core.utils.InstructionRemover;
public
class
BlockExceptionHandler
extends
AbstractVisitor
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
BlockExceptionHandler
.
class
);
@Override
public
void
visit
(
MethodNode
mth
)
{
if
(
mth
.
isNoCode
())
{
...
...
@@ -47,20 +53,22 @@ public class BlockExceptionHandler extends AbstractVisitor {
}
InsnNode
me
=
block
.
getInstructions
().
get
(
0
);
ExcHandlerAttr
handlerAttr
=
me
.
get
(
AType
.
EXC_HANDLER
);
if
(
handlerAttr
==
null
||
me
.
getType
()
!=
InsnType
.
MOVE_EXCEPTION
)
{
if
(
handlerAttr
==
null
)
{
return
;
}
ExceptionHandler
excHandler
=
handlerAttr
.
getHandler
();
block
.
addAttr
(
handlerAttr
);
// set correct type for 'move-exception' operation
ArgType
type
=
excHandler
.
isCatchAll
()
?
ArgType
.
THROWABLE
:
excHandler
.
getCatchType
().
getType
();
RegisterArg
resArg
=
me
.
getResult
();
resArg
=
InsnArg
.
reg
(
resArg
.
getRegNum
(),
type
);
me
.
setResult
(
resArg
);
me
.
add
(
AFlag
.
DONT_INLINE
);
excHandler
.
setArg
(
resArg
);
ArgType
argType
=
excHandler
.
isCatchAll
()
?
ArgType
.
THROWABLE
:
excHandler
.
getCatchType
().
getType
();
if
(
me
.
getType
()
==
InsnType
.
MOVE_EXCEPTION
)
{
// set correct type for 'move-exception' operation
RegisterArg
resArg
=
InsnArg
.
reg
(
me
.
getResult
().
getRegNum
(),
argType
);
me
.
setResult
(
resArg
);
me
.
add
(
AFlag
.
DONT_INLINE
);
excHandler
.
setArg
(
resArg
);
}
else
{
// handler arguments not used
excHandler
.
setArg
(
new
NamedArg
(
"unused"
,
argType
));
}
}
private
static
void
processExceptionHandlers
(
MethodNode
mth
,
BlockNode
block
)
{
...
...
@@ -147,5 +155,8 @@ public class BlockExceptionHandler extends AbstractVisitor {
break
;
}
}
if
(
handler
.
getHandlerBlock
()
==
null
)
{
LOG
.
warn
(
"Exception handler block not set for {}, mth: {}"
,
handler
,
mth
);
}
}
}
jadx-core/src/main/java/jadx/core/dex/visitors/regions/ProcessTryCatchRegions.java
浏览文件 @
7d983f28
...
...
@@ -86,8 +86,7 @@ public class ProcessTryCatchRegions extends AbstractRegionVisitor {
if
(
domBlocks
.
size
()
!=
1
)
{
domBlock
=
BlockUtils
.
getTopBlock
(
domBlocks
);
if
(
domBlock
==
null
)
{
throw
new
JadxRuntimeException
(
"Exception block dominator not found, method:"
+
mth
+
". bs: "
+
domBlocks
);
throw
new
JadxRuntimeException
(
"Exception block dominator not found, method:"
+
mth
+
", dom blocks: "
+
domBlocks
);
}
}
else
{
domBlock
=
domBlocks
.
get
(
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录