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
87794d25
Commit
87794d25
authored
Apr 19, 2013
by
Skylot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug for args in methods with generics
parent
c4f21199
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
6 deletions
+38
-6
MethodGen.java
src/main/java/jadx/codegen/MethodGen.java
+1
-1
ArgType.java
src/main/java/jadx/dex/instructions/args/ArgType.java
+4
-0
MethodNode.java
src/main/java/jadx/dex/nodes/MethodNode.java
+8
-5
Utils.java
src/main/java/jadx/utils/Utils.java
+2
-0
TestGenerics.java
src/samples/java/jadx/samples/TestGenerics.java
+23
-0
No files found.
src/main/java/jadx/codegen/MethodGen.java
View file @
87794d25
...
...
@@ -263,7 +263,7 @@ public class MethodGen {
}
private
void
makeFallbackMethod
(
CodeWriter
code
,
MethodNode
mth
)
{
if
(
!
mth
.
getAccessFlags
().
isStatic
()
)
{
if
(
mth
.
getThisArg
()
!=
null
)
{
code
.
startLine
(
getFallbackMethodGen
(
mth
).
makeArgName
(
mth
.
getThisArg
())).
add
(
" = this;"
);
}
makeFallbackInsns
(
code
,
mth
,
mth
.
getInstructions
(),
true
);
...
...
src/main/java/jadx/dex/instructions/args/ArgType.java
View file @
87794d25
...
...
@@ -5,6 +5,7 @@ import jadx.utils.Utils;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -421,6 +422,9 @@ public abstract class ArgType {
}
private
static
List
<
ArgType
>
parseSignatureListInner
(
String
str
,
boolean
parsePrimitives
)
{
if
(
str
.
isEmpty
())
{
return
Collections
.
emptyList
();
}
if
(
str
.
equals
(
"*"
))
{
return
Arrays
.
asList
(
UNKNOWN
);
}
...
...
src/main/java/jadx/dex/nodes/MethodNode.java
View file @
87794d25
...
...
@@ -154,29 +154,32 @@ public class MethodNode extends AttrNode implements ILoadable {
LOG
.
warn
(
"Signature parse error: {}"
,
returnType
);
return
false
;
}
if
(
mthInfo
.
getArgumentsTypes
().
isEmpty
())
{
argsList
=
Collections
.
emptyList
();
return
true
;
}
List
<
ArgType
>
argsTypes
=
ArgType
.
parseSignatureList
(
argsTypesStr
);
if
(
argsTypes
==
null
)
return
false
;
if
(
argsTypes
.
size
()
!=
mthInfo
.
getArgumentsTypes
().
size
())
{
if
(
argsTypes
.
isEmpty
())
{
return
false
;
}
if
(!
mthInfo
.
isConstructor
())
{
LOG
.
warn
(
"Wrong signature parse result: "
+
sign
+
" -> "
+
argsTypes
+
", not generic version: "
+
mthInfo
.
getArgumentsTypes
());
return
false
;
}
else
if
(
getParentClass
().
getAccessFlags
().
isEnum
())
{
// TODO:
argsTypes
.
add
(
0
,
mthInfo
.
getArgumentsTypes
().
get
(
1
));
argsTypes
.
add
(
0
,
mthInfo
.
getArgumentsTypes
().
get
(
0
));
argsTypes
.
add
(
1
,
mthInfo
.
getArgumentsTypes
().
get
(
1
));
}
else
{
// add synthetic arg for outer class
argsTypes
.
add
(
0
,
mthInfo
.
getArgumentsTypes
().
get
(
0
));
}
if
(
argsTypes
.
size
()
!=
mthInfo
.
getArgumentsTypes
().
size
())
{
return
false
;
}
}
initArguments
(
argsTypes
);
return
true
;
}
...
...
src/main/java/jadx/utils/Utils.java
View file @
87794d25
...
...
@@ -49,6 +49,8 @@ public class Utils {
case
'>'
:
case
','
:
case
' '
:
case
'?'
:
case
'*'
:
break
;
default
:
...
...
src/samples/java/jadx/samples/TestGenerics.java
View file @
87794d25
package
jadx
.
samples
;
import
java.util.ArrayList
;
import
java.util.Enumeration
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -141,6 +142,28 @@ public class TestGenerics extends AbstractTest {
}
}
private
class
TestConstructor
implements
Enumeration
<
String
>
{
private
final
TestGenerics
a
;
TestConstructor
(
TestGenerics
a
)
{
this
.
a
=
a
;
}
@Override
public
boolean
hasMoreElements
()
{
return
false
;
}
@Override
public
String
nextElement
()
{
return
null
;
}
}
public
Enumeration
<
String
>
testThis
()
{
return
new
TestConstructor
(
this
);
}
private
List
<
String
>
test1
(
Map
<
String
,
String
>
map
)
{
List
<
String
>
list
=
new
ArrayList
<
String
>();
String
str
=
map
.
get
(
"key"
);
...
...
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