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

GP-272 - Gnu Demangler - fixed demangler failure on function parameter

Browse Source 
that has more than 2 sets of parentheses
This commit is contained in:
dragonmacher
2020-11-10 17:23:11 -05:00
parent 34535a8563
commit bf9245d54f
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/GnuDemangler/src/main/java/ghidra/app/util/demangler/gnu/GnuDemanglerParser.java
View File

@@ -755,7 +755,7 @@ public class GnuDemanglerParser {
else {
int startParenCount =
StringUtilities.countOccurrences(datatype.substring(i), '(');
boolean hasPointerParens = startParenCount == 2;
boolean hasPointerParens = startParenCount >= 2;
if (hasPointerParens) {
Demangled namespace = ddt.getNamespace();
DemangledFunctionPointer dfp = parseFunctionPointer(datatype);

31
Ghidra/Features/GnuDemangler/src/test/java/ghidra/app/util/demangler/GnuDemanglerParserTest.java
View File

@@ -1540,6 +1540,37 @@ public class GnuDemanglerParserTest extends AbstractGenericTest {
signature);
}
@Test
public void testFunctionParameterWithMultipleParentheses() throws Exception {
//
// Mangled: __ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcON3WTF8FunctionIFNSt3__110unique_ptrINS_9TextCodecENS5_14default_deleteIS7_EEEEvEEEE
//
// Demangled: undefined WebCore::TextCodecICU::registerCodecs(void ()(char const *,WTF::Function<std::__1::unique_ptr<WebCore::TextCodec,std::__1::default_delete<WebCore::TextCodec>> ()> &&))
//
// The regression tested here revolves around this parameter:
//
// void ()(char const *,WTF::Function<std::__1::unique_ptr<WebCore::TextCodec,std::__1::default_delete<WebCore::TextCodec>> ()> &&
//
// (note the trailing '()' chars)
//
DemangledObject object = parser.parse(
"__ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcON3WTF8FunctionIFNSt3__110unique_ptrINS_9TextCodecENS5_14default_deleteIS7_EEEEvEEEE",
"undefined WebCore::TextCodecICU::registerCodecs(void ()(char const *,WTF::Function<std::__1::unique_ptr<WebCore::TextCodec,std::__1::default_delete<WebCore::TextCodec>> ()> &&))");
assertNotNull(object);
assertType(object, DemangledFunction.class);
String name = "registerCodecs";
assertName(object, name, "WebCore", "TextCodecICU");
String signature = object.getSignature(false);
assertEquals(
"undefined WebCore::TextCodecICU::registerCodecs(void ()(char const *,WTF::Function<std::__1::unique_ptr<WebCore::TextCodec,std::__1::default_delete<WebCore::TextCodec>> ()> &&))",
signature);
}
@Test
public void testFunctionWithVarargsRvalueParameter() throws Exception {