yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

GP-1051 - Demangler - fixed spaces inside of namespaces for demangled

Browse source 
address tables
This commit is contained in:
dragonmacher 2021-06-22 18:02:27 -04:00
parent 82c8ba1a1c
commit a74b0c7871
3 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledAddressTable.java
View file

@ -56,7 +56,7 @@ public class DemangledAddressTable extends DemangledObject {
@Override @Override
public String getSignature(boolean format) { public String getSignature(boolean format) {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
if (specialPrefix != null) { if (specialPrefix != null) {
buffer.append(specialPrefix); buffer.append(specialPrefix);

37
Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
View file

@ -552,20 +552,8 @@ public class GnuDemanglerParser {
String name = itemText.substring(pos + 2); String name = itemText.substring(pos + 2);
DemangledObject item = parseFunctionOrVariable(name); DemangledObject item = parseFunctionOrVariable(name);
// DemangledType namespaceType = createNamespaceDemangledType(parent);
// Convert the parent type to a suitable namespace. The parent type may have spaces item.setNamespace(namespaceType);
// in its name, which is not allowed in an applied namespace.
//
// We may eventually want to move this logic into the DemangledObject's
// createNamespace() method. This would also apply to the convertToNamespaces()
// method in this class.
//
String namespaceName = parent.getNamespaceName();
String escapedName = removeBadSpaces(namespaceName);
DemangledType type = new DemangledType(mangledSource, demangledSource, escapedName);
type.setNamespace(parent.getNamespace());
item.setNamespace(type);
return item; return item;
} }
@ -1583,11 +1571,30 @@ public class GnuDemanglerParser {
DemangledObject doBuild(Demangled namespace) { DemangledObject doBuild(Demangled namespace) {
DemangledAddressTable addressTable = DemangledAddressTable addressTable =
new DemangledAddressTable(mangledSource, demangled, name, true); new DemangledAddressTable(mangledSource, demangled, name, true);
addressTable.setNamespace(namespace); DemangledType namespaceType = createNamespaceDemangledType(namespace);
addressTable.setNamespace(namespaceType);
return addressTable; return addressTable;
} }
} }
//
// Convert the given demangled object into a suitable namespace. The given type may have spaces
// in its name, which is not allowed in an *applied* namespace.
//
// We may eventually want to move this logic into the DemangledObject's createNamespace()
// method. This would also apply to the convertToNamespaces() method in this class. The
// reasoning is that this parser should create namespaces just as they are given to the parser,
// while the code responsible for applying the namespace should be responsible for domain
// logic, such as removing spaces in the namespace name.
//
private DemangledType createNamespaceDemangledType(Demangled namespace) {
String namespaceName = namespace.getNamespaceName();
String escapedName = removeBadSpaces(namespaceName);
DemangledType type = new DemangledType(mangledSource, demangledSource, escapedName);
type.setNamespace(namespace.getNamespace());
return type;
}
private class OverloadOperatorHandler extends OperatorHandler { private class OverloadOperatorHandler extends OperatorHandler {
OverloadOperatorHandler(String demangled) { OverloadOperatorHandler(String demangled) {

19
Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
View file

@ -540,6 +540,25 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
assertEquals("class_with_trailing_numbers1234::typeinfo", object.getSignature(false)); assertEquals("class_with_trailing_numbers1234::typeinfo", object.getSignature(false));
} }
@Test
public void testTypeInfo_AddressTable_InFunctionNamespace() throws Exception {
String mangled =
"_ZTIFR17ClimateAttributesPSt4pairISt17reference_wrapperI5BiomeES2_I24IWorldRegistriesProviderEEE";
String demangled = process.demangle(mangled);
assertEquals(
"typeinfo for ClimateAttributes& (std::pair<std::reference_wrapper<Biome>, std::reference_wrapper<IWorldRegistriesProvider> >*)",
demangled);
DemangledObject object = parser.parse(mangled, demangled);
String namespaceString =
"ClimateAttributes&(std::pair<std::reference_wrapper<Biome>,std::reference_wrapper<IWorldRegistriesProvider>>*)";
assertType(object, DemangledAddressTable.class);
assertName(object, "typeinfo", namespaceString);
assertEquals(namespaceString + "::typeinfo", object.getSignature(false));
}
@Test @Test
public void testTypeInfo() throws Exception { public void testTypeInfo() throws Exception {
String mangled = "_ZTIN4Arts28FileInputStream_impl_FactoryE"; String mangled = "_ZTIN4Arts28FileInputStream_impl_FactoryE";