Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GT-2743_caheckman fixed dex decompilation due to regression from prior

Browse Source 
fix (#247)
This commit is contained in:
emteere 2019-04-05 15:32:55 -04:00
parent 49c2010b63
commit d95a0a05a1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/PcodeDataTypeManager.java
View File

@ -261,7 +261,16 @@ public class PcodeDataTypeManager {
if (type instanceof Array) {
return buildType(type, size);
}
if (!(type instanceof FunctionDefinition) && type.getLength() <= 0) {
if (type instanceof FunctionDefinition) {
long id = progDataTypes.getID(type);
if (id <= 0) {
// Its possible the FunctionDefinition was built on the fly and is not
// a permanent data-type of the program with an ID. In this case, we can't
// construct a <typeref> tag but must build a full <type> tag.
return buildType(type, size);
}
}
else if (type.getLength() <= 0) {
return buildType(type, size);
}
StringBuilder resBuf = new StringBuilder();