Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/caheckman_GT-2704' into Ghidra_9.0.2

Browse Source
This commit is contained in:
ghidravore 2019-04-02 18:35:30 -04:00
commit e23cc6b72b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,10 +261,7 @@ public class PcodeDataTypeManager {
if (type instanceof Array) {
return buildType(type, size);
}
if (type instanceof FunctionDefinition) {
return buildType(type, size);
}
if (type.getLength() <= 0) {
if (!(type instanceof FunctionDefinition) && type.getLength() <= 0) {
return buildType(type, size);
}
StringBuilder resBuf = new StringBuilder();
@ -541,7 +538,7 @@ public class PcodeDataTypeManager {
}
resBuf.append("<type");
if ((type instanceof Pointer) || (type instanceof Array) ||
(type instanceof FunctionDefinition) || (type.getLength() <= 0)) {
(!(type instanceof FunctionDefinition) && type.getLength() <= 0)) {
SpecXmlUtils.encodeStringAttribute(resBuf, "name", "");
}
else {