Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jadx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open-source
jadx
Commits
eaaeb2c8
Commit
eaaeb2c8
authored
Aug 20, 2018
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: fix return block split after try/catch (#295)
parent
0ae7c1ef
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
1 deletion
+51
-1
BlockProcessor.java
...va/jadx/core/dex/visitors/blocksmaker/BlockProcessor.java
+2
-1
TestTryCatchNoMove.java
...a/jadx/tests/integration/trycatch/TestTryCatchNoMove.java
+31
-0
TestTryCatchNoMove.smali
jadx-core/src/test/smali/trycatch/TestTryCatchNoMove.smali
+18
-0
No files found.
jadx-core/src/main/java/jadx/core/dex/visitors/blocksmaker/BlockProcessor.java
View file @
eaaeb2c8
...
...
@@ -454,7 +454,8 @@ public class BlockProcessor extends AbstractVisitor {
}
BlockNode
exitBlock
=
mth
.
getExitBlocks
().
get
(
0
);
if
(
exitBlock
.
getInstructions
().
size
()
!=
1
||
exitBlock
.
contains
(
AFlag
.
SYNTHETIC
))
{
||
exitBlock
.
contains
(
AFlag
.
SYNTHETIC
)
||
exitBlock
.
contains
(
AType
.
SPLITTER_BLOCK
))
{
return
false
;
}
List
<
BlockNode
>
preds
=
exitBlock
.
getPredecessors
();
...
...
jadx-core/src/test/java/jadx/tests/integration/trycatch/TestTryCatchNoMove.java
0 → 100644
View file @
eaaeb2c8
package
jadx
.
tests
.
integration
.
trycatch
;
import
org.junit.Test
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.SmaliTest
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
class
TestTryCatchNoMove
extends
SmaliTest
{
// private static void test(AutoCloseable closeable) {
// if (closeable != null) {
// try {
// closeable.close();
// } catch (Exception ignored) {
// }
// }
// }
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNodeFromSmaliWithPath
(
"trycatch"
,
"TestTryCatchNoMove"
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"if (autoCloseable != null) {"
));
assertThat
(
code
,
containsOne
(
"try {"
));
assertThat
(
code
,
containsOne
(
"autoCloseable.close();"
));
}
}
jadx-core/src/test/smali/trycatch/TestTryCatchNoMove.smali
0 → 100644
View file @
eaaeb2c8
.class public LTestTryCatchNoMove;
.super Ljava/lang/Object;
.method private static test(Ljava/lang/AutoCloseable;)V
.locals 0
if-eqz p0, :cond_0
.line 187
:try_start_0
invoke-interface {p0}, Ljava/lang/AutoCloseable;->close()V
:try_end_0
.catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
:catch_0
:cond_0
return-void
.end method
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment