yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-790_ghizard_Change_Demangler_constructor_return_type' into patch

Browse source
This commit is contained in:
ghidra1 2021-03-23 15:12:25 -04:00
commit 006b3d0ca1
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledFunction.java
View file

@ -461,8 +461,12 @@ public class DemangledFunction extends DemangledObject {
// If returnType is null check for constructor or destructor names // If returnType is null check for constructor or destructor names
if (THIS_CALL.equals(function.getCallingConventionName())) { if (THIS_CALL.equals(function.getCallingConventionName())) {
String n = getName(); String n = getName();
if (n.equals("~" + namespace.getName()) || n.equals(namespace.getName())) { if (n.equals(namespace.getName())) {
// constructor && destructor // constructor
return DataType.DEFAULT;
}
if (n.equals("~" + namespace.getName())) {
// destructor
return VoidDataType.dataType; return VoidDataType.dataType;
} }
} }