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
77cee15d
Commit
77cee15d
authored
Apr 25, 2019
by
Ahmed Ashour
Committed by
skylot
Apr 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: add cast for null in overloaded methods (#636) (PR #637)
parent
e7e7b664
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
1 deletion
+39
-1
InsnGen.java
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
+4
-1
TestCastOfNull.java
...st/java/jadx/tests/integration/others/TestCastOfNull.java
+35
-0
No files found.
jadx-core/src/main/java/jadx/core/codegen/InsnGen.java
View file @
77cee15d
...
...
@@ -762,7 +762,10 @@ public class InsnGen {
}
}
ArgType
argType
=
arg
.
getType
();
if
(
argType
.
equals
(
origType
))
{
if
(
argType
.
equals
(
origType
)
// null cast to object
&&
(!
arg
.
isLiteral
()
||
((
LiteralArg
)
arg
).
getLiteral
()
!=
0
||
(!
argType
.
isArray
()
&&
!
argType
.
isObject
())))
{
return
false
;
}
if
(
origType
.
isGeneric
())
{
...
...
jadx-core/src/test/java/jadx/tests/integration/others/TestCastOfNull.java
0 → 100644
View file @
77cee15d
package
jadx
.
tests
.
integration
.
others
;
import
static
jadx
.
tests
.
api
.
utils
.
JadxMatchers
.
containsOne
;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
org.junit.jupiter.api.Test
;
import
jadx.NotYetImplemented
;
import
jadx.core.dex.nodes.ClassNode
;
import
jadx.tests.api.IntegrationTest
;
public
class
TestCastOfNull
extends
IntegrationTest
{
public
static
class
TestCls
{
public
void
test
()
{
m
((
long
[])
null
);
m
((
String
)
null
);
}
public
void
m
(
long
[]
a
)
{
}
public
void
m
(
String
s
)
{
}
}
@Test
public
void
test
()
{
ClassNode
cls
=
getClassNode
(
TestCls
.
class
);
String
code
=
cls
.
getCode
().
toString
();
assertThat
(
code
,
containsOne
(
"m((long[]) null);"
));
assertThat
(
code
,
containsOne
(
"m((String) null);"
));
}
}
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