Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ql04210214
jadx
提交
9d5dda12
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,体验更适合开发者的 AI 搜索 >>
提交
9d5dda12
编写于
5月 16, 2019
作者:
S
Skylot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: handle anonymous class self inlining (#604)
上级
84b9f111
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
120 addition
and
3 deletion
+120
-3
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
+4
-0
jadx-core/src/main/java/jadx/core/codegen/CodeGen.java
jadx-core/src/main/java/jadx/core/codegen/CodeGen.java
+13
-1
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+8
-0
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
+3
-0
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
+1
-0
jadx-core/src/main/java/jadx/core/utils/files/InputFile.java
jadx-core/src/main/java/jadx/core/utils/files/InputFile.java
+3
-0
jadx-core/src/main/java/jadx/core/utils/files/JavaToDex.java
jadx-core/src/main/java/jadx/core/utils/files/JavaToDex.java
+1
-2
jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
+4
-0
jadx-core/src/test/java/jadx/tests/integration/inner/TestIncorrectAnonymousClass.java
.../tests/integration/inner/TestIncorrectAnonymousClass.java
+38
-0
jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali
...t/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali
+24
-0
jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls.smali
...est/smali/inner/TestIncorrectAnonymousClass/TestCls.smali
+21
-0
未找到文件。
jadx-core/src/main/java/jadx/core/codegen/ClassGen.java
浏览文件 @
9d5dda12
...
...
@@ -36,6 +36,7 @@ import jadx.core.utils.CodeGenUtils;
import
jadx.core.utils.ErrorsCounter
;
import
jadx.core.utils.Utils
;
import
jadx.core.utils.exceptions.CodegenException
;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
public
class
ClassGen
{
...
...
@@ -261,6 +262,9 @@ public class ClassGen {
try
{
addMethod
(
code
,
mth
);
}
catch
(
Exception
e
)
{
if
(
mth
.
getParentClass
().
getTopParentClass
().
contains
(
AFlag
.
RESTART_CODEGEN
))
{
throw
new
JadxRuntimeException
(
"Method generation error"
,
e
);
}
code
.
newLine
().
add
(
"/*"
);
code
.
newLine
().
addMultiLine
(
ErrorsCounter
.
methodError
(
mth
,
"Method generation error"
,
e
));
Utils
.
appendStackTrace
(
code
,
e
);
...
...
jadx-core/src/main/java/jadx/core/codegen/CodeGen.java
浏览文件 @
9d5dda12
...
...
@@ -3,6 +3,7 @@ package jadx.core.codegen;
import
jadx.core.dex.attributes.AFlag
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.core.utils.exceptions.CodegenException
;
import
jadx.core.utils.exceptions.JadxRuntimeException
;
public
class
CodeGen
{
...
...
@@ -11,7 +12,18 @@ public class CodeGen {
cls
.
setCode
(
CodeWriter
.
EMPTY
);
}
else
{
ClassGen
clsGen
=
new
ClassGen
(
cls
,
cls
.
root
().
getArgs
());
cls
.
setCode
(
clsGen
.
makeClass
());
CodeWriter
code
;
try
{
code
=
clsGen
.
makeClass
();
}
catch
(
Exception
e
)
{
if
(
cls
.
contains
(
AFlag
.
RESTART_CODEGEN
))
{
cls
.
remove
(
AFlag
.
RESTART_CODEGEN
);
code
=
clsGen
.
makeClass
();
}
else
{
throw
new
JadxRuntimeException
(
"Code generation error"
,
e
);
}
}
cls
.
setCode
(
code
);
}
}
...
...
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
浏览文件 @
9d5dda12
...
...
@@ -591,6 +591,14 @@ public class InsnGen {
}
private
void
inlineAnonymousConstructor
(
CodeWriter
code
,
ClassNode
cls
,
ConstructorInsn
insn
)
throws
CodegenException
{
if
(
this
.
mth
.
getParentClass
()
==
cls
)
{
cls
.
remove
(
AFlag
.
ANONYMOUS_CLASS
);
cls
.
remove
(
AFlag
.
DONT_GENERATE
);
mth
.
getParentClass
().
getTopParentClass
().
add
(
AFlag
.
RESTART_CODEGEN
);
throw
new
CodegenException
(
"Anonymous inner class unlimited recursion detected."
+
" Convert class to inner: "
+
cls
.
getClassInfo
().
getFullName
());
}
cls
.
add
(
AFlag
.
DONT_GENERATE
);
ArgType
parent
;
if
(
cls
.
getInterfaces
().
size
()
==
1
)
{
...
...
jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
浏览文件 @
9d5dda12
...
...
@@ -206,6 +206,9 @@ public class MethodGen {
classGen
.
insertDecompilationProblems
(
code
,
mth
);
addInstructions
(
code
);
}
catch
(
Exception
e
)
{
if
(
mth
.
getParentClass
().
getTopParentClass
().
contains
(
AFlag
.
RESTART_CODEGEN
))
{
throw
e
;
}
mth
.
addError
(
"Method code generation error"
,
e
);
classGen
.
insertDecompilationProblems
(
code
,
mth
);
addInstructions
(
code
);
...
...
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
浏览文件 @
9d5dda12
...
...
@@ -15,6 +15,7 @@ public enum AFlag {
DONT_WRAP
,
DONT_INLINE
,
DONT_GENERATE
,
// process as usual, but don't output to generated code
RESTART_CODEGEN
,
DONT_RENAME
,
// do not rename during deobfuscation
REMOVE
,
// can be completely removed
ADDED_TO_REGION
,
...
...
jadx-core/src/main/java/jadx/core/utils/files/InputFile.java
浏览文件 @
9d5dda12
...
...
@@ -183,6 +183,9 @@ public class InputFile {
if
(
pathList
.
isEmpty
())
{
throw
new
JadxException
(
"Empty dx output"
);
}
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"result dex files: {}"
,
pathList
);
}
return
pathList
;
}
catch
(
Exception
e
)
{
throw
new
DecodeException
(
"java class to dex conversion error:\n "
+
e
.
getMessage
(),
e
);
...
...
jadx-core/src/main/java/jadx/core/utils/files/JavaToDex.java
浏览文件 @
9d5dda12
...
...
@@ -41,7 +41,7 @@ public class JavaToDex {
try
(
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
();
ByteArrayOutputStream
errOut
=
new
ByteArrayOutputStream
())
{
DxContext
context
=
new
DxContext
(
out
,
errOut
);
Path
dir
=
FileUtils
.
createTempDir
(
jar
.
getFileName
().
toString
()
);
Path
dir
=
FileUtils
.
createTempDir
(
"jar-to-dex-"
);
DxArgs
args
=
new
DxArgs
(
context
,
dir
.
toAbsolutePath
().
toString
(),
...
...
@@ -58,7 +58,6 @@ public class JavaToDex {
child
.
toFile
().
deleteOnExit
();
}
}
dir
.
toFile
().
deleteOnExit
();
return
list
;
}
catch
(
Exception
e
)
{
throw
new
JadxException
(
"dx exception: "
+
e
.
getMessage
(),
e
);
...
...
jadx-core/src/test/java/jadx/tests/api/SmaliTest.java
浏览文件 @
9d5dda12
...
...
@@ -49,6 +49,10 @@ public abstract class SmaliTest extends IntegrationTest {
return
getClassNodeFromFile
(
outDex
,
pkg
+
'.'
+
clsName
);
}
protected
ClassNode
getClassNodeFromSmaliFiles
(
String
clsName
)
{
return
searchCls
(
loadFromSmaliFiles
(),
getTestPkg
()
+
'.'
+
clsName
);
}
protected
List
<
ClassNode
>
loadFromSmaliFiles
()
{
File
outDex
=
createTempFile
(
".dex"
);
compileSmali
(
outDex
,
collectSmaliFiles
(
getTestPkg
(),
getTestName
()));
...
...
jadx-core/src/test/java/jadx/tests/integration/inner/TestIncorrectAnonymousClass.java
0 → 100644
浏览文件 @
9d5dda12
package
jadx.tests.integration.inner
;
import
org.junit.jupiter.api.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
countString
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
public
class
TestIncorrectAnonymousClass
extends
SmaliTest
{
// @formatter:off
/*
public static class TestCls {
public final class 1 {
public void invoke() {
new 1(); // cause infinite self inline
}
}
public void test() {
new 1();
}
}
*/
// @formatter:on
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNodeFromSmaliFiles
(
"TestCls"
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"public final class AnonymousClass1 {"
));
assertThat
(
code
,
countString
(
2
,
"new AnonymousClass1();"
));
}
}
jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls$1.smali
0 → 100644
浏览文件 @
9d5dda12
.class public final Linner/TestCls$1;
.super Ljava/lang/Object;
# direct methods
.method public constructor <init>()V
.registers 1
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
.end method
# virtual methods
.method public invoke()V
.registers 2
new-instance v0, Linner/TestCls$1;
invoke-direct {v0}, Linner/TestCls$1;-><init>()V
return-void
.end method
jadx-core/src/test/smali/inner/TestIncorrectAnonymousClass/TestCls.smali
0 → 100644
浏览文件 @
9d5dda12
.class public Linner/TestCls;
.super Ljava/lang/Object;
# direct methods
.method public constructor <init>()V
.registers 1
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
.end method
.method public test()V
.registers 2
new-instance v0, Linner/TestCls$1;
invoke-direct {v0}, Linner/TestCls$1;-><init>()V
return-void
.end method
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录