Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
b1588583
Commit
b1588583
authored
May 27, 2019
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: prevent NPE while processing try/catch regions (#673)
parent
d6737860
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
RegionMaker.java
...main/java/jadx/core/dex/visitors/regions/RegionMaker.java
+3
-0
BlockUtils.java
jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
+3
-0
No files found.
jadx-core/src/main/java/jadx/core/dex/visitors/regions/RegionMaker.java
View file @
b1588583
...
...
@@ -954,6 +954,9 @@ public class RegionMaker {
Set
<
BlockNode
>
exits
=
new
HashSet
<>();
for
(
BlockNode
splitter
:
splitters
)
{
for
(
BlockNode
handler
:
blocks
)
{
if
(
handler
.
contains
(
AFlag
.
REMOVE
))
{
continue
;
}
List
<
BlockNode
>
s
=
splitter
.
getSuccessors
();
if
(
s
.
isEmpty
())
{
LOG
.
debug
(
ErrorsCounter
.
formatMsg
(
mth
,
"No successors for splitter: "
+
splitter
));
...
...
jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
View file @
b1588583
...
...
@@ -432,6 +432,9 @@ public class BlockUtils {
if
(
b1
==
null
||
b2
==
null
)
{
return
null
;
}
if
(
b1
.
getDomFrontier
()
==
null
||
b2
.
getDomFrontier
()
==
null
)
{
return
null
;
}
BitSet
b
=
new
BitSet
();
b
.
or
(
b1
.
getDomFrontier
());
b
.
and
(
b2
.
getDomFrontier
());
...
...
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