mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GT-2831 - Demangler - Fixed the name trimming bug for names that are too

Browse Source 
long
This commit is contained in:
dragonmacher
2019-04-24 10:17:37 -04:00
parent a0354a9746
commit 24313e73ee
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledObject.java
View File

@@ -49,15 +49,22 @@ public abstract class DemangledObject {
protected String specialSuffix; protected String specialSuffix;
protected DemangledType namespace; protected DemangledType namespace;
protected String visibility;//public, protected, etc. protected String visibility;//public, protected, etc.
//TODO: storageClass refers to things such as "static" but const and volatile are typeQualifiers. Should change this everywhere(?).
protected String storageClass;//const, volatile, etc //TODO: storageClass refers to things such as "static" but const and volatile are
// typeQualifiers. Should change this everywhere(?).
protected String storageClass; //const, volatile, etc
//TODO: see above regarding this belonging to the "true" storageClass items.
protected boolean isStatic;
//TODO: determine what type of keyword this is (not type qualifier or storage class).
protected boolean isVirtual;
private String demangledName; private String demangledName;
private String name; private String name;
private boolean isConst; private boolean isConst;
private boolean isVolatile; private boolean isVolatile;
private boolean isPointer64; private boolean isPointer64;
protected boolean isStatic; //TODO: see above regarding this belonging to the "true" storageClass items.
protected boolean isVirtual; //TODO: determine what type of keyword this is (not type qualifier or storage class).
protected boolean isThunk; protected boolean isThunk;
protected boolean isUnaligned; protected boolean isUnaligned;
protected boolean isRestrict; protected boolean isRestrict;
@@ -528,7 +535,12 @@ public abstract class DemangledObject {
return functionPermitted && symbolType == SymbolType.FUNCTION; return functionPermitted && symbolType == SymbolType.FUNCTION;
} }
/** Ensure name does not pass the limit defined by Ghidra */ /**
* Ensure name does not pass the limit defined by Ghidra
*
* @param name the name whose length to restrict
* @return the name, updated as needed
*/
protected static String ensureNameLength(String name) { protected static String ensureNameLength(String name) {
int length = name.length(); int length = name.length();
if (length <= SymbolUtilities.MAX_SYMBOL_NAME_LENGTH) { if (length <= SymbolUtilities.MAX_SYMBOL_NAME_LENGTH) {
@@ -544,7 +556,7 @@ public abstract class DemangledObject {
StringBuilder buffy = new StringBuilder(); StringBuilder buffy = new StringBuilder();
buffy.append(name.substring(0, SymbolUtilities.MAX_SYMBOL_NAME_LENGTH / 2)); buffy.append(name.substring(0, SymbolUtilities.MAX_SYMBOL_NAME_LENGTH / 2));
buffy.append("..."); buffy.append("...");
buffy.append(length - 100); // trailing data buffy.append(name.substring(length - 100)); // trailing data
return buffy.toString(); return buffy.toString();
} }