github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_ghizard_fix_demangler_skip_logic'

Browse Source
This commit is contained in:
ghidra1
2021-04-19 14:57:25 -04:00
parent 486cee0f10 0fcee8998e
commit b57744d4e0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -332,7 +332,7 @@ public abstract class DemangledObject implements Demangled {
throw new DemangledException("Symbol did not demangle at address: " + address);
}
if (!address.isMemoryAddress() || !program.getMemory().contains(address)) {
throw new IllegalArgumentException("Invalid program memory address: " + address);
return true; // skip this symbol
}
String comment = program.getListing().getComment(CodeUnit.PLATE_COMMENT, address);

5
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/app/util/demangler/DemangledFunctionTest.java
View File

@@ -263,8 +263,7 @@ public class DemangledFunctionTest extends AbstractGhidraHeadlessIntegrationTest
String className =
"F<class_E::D::G<struct_E::D::H<bool_(__cdecl*const)(enum_C::B_const&),0>,bool,enum_C::B_const&>_>";
String functionName =
className + "<class_E::D::A<bool,enum_C::B_const&>_>";
String functionName = className + "<class_E::D::A<bool,enum_C::B_const&>_>";
Function function = assertFunction(functionName, addr);
assertNoBookmarkAt(addr);
@@ -294,7 +293,7 @@ public class DemangledFunctionTest extends AbstractGhidraHeadlessIntegrationTest
* location symbol.
*/
@Test
public void testApply_ExtrnalFunctionInClassInNamespace() throws Exception {
public void testApply_ExternalFunctionInClassInNamespace() throws Exception {
// this is: public long __thiscall ATL::CRegKey::Close(void)
String mangled = "?Close@CRegKey@ATL@@QAEJXZ";