Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-5713 - PDB - adjust MSFT thunk processing to allow demangled signatures to be used when not considered to be a Ghidra thunk

ghizard348c423ae280
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
index b3925ed4d6..4d0105f003 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/DefaultPdbApplicator.java
@@ -2425,13 +2425,20 @@ public class DefaultPdbApplicator implements PdbApplicator {
}
}
+ boolean existingIsMangled = isMangled(existingSymbol.getName());
+ if (existingIsMangled && !isNewFunctionSignature) {
+ // we don't have a new signature, but the existing symbol is mangled, and thus can
+ // possibly provide it... so do not make new symbol primary
+ return doCreateSymbol(address, symbolPath, false, plateAddition);
+ }
+
if (symbolPath.getParent() != null) {
// new symbol has non-global namespace
return doCreateSymbol(address, symbolPath, true, plateAddition);
}
// Both existing and new symbols are in global namespace at this point
- if (isMangled(symbolPath.getName()) && !isMangled(existingSymbol.getName())) {
+ if (isMangled(symbolPath.getName()) && !existingIsMangled) {
// new symbol is mangled, but don't override existing one if it is mangled
return doCreateSymbol(address, symbolPath, true, plateAddition);
}