Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-01-21 00:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2864_ghidra1_CorrectPDBFuncName' into patch

Browse Source
This commit is contained in:
Ryan Kurtz 2022-11-19 03:08:36 -05:00
commit 88b7734608
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/FunctionSymbolApplier.java
View File

@ -30,8 +30,8 @@ import ghidra.program.model.data.FunctionDefinition;
import ghidra.program.model.lang.Register;
import ghidra.program.model.listing.*;
import ghidra.program.model.symbol.SourceType;
import ghidra.util.exception.AssertException;
import ghidra.util.exception.CancelledException;
import ghidra.util.InvalidNameException;
import ghidra.util.exception.*;
import ghidra.util.task.TaskMonitor;
/**
@ -328,7 +328,17 @@ public class FunctionSymbolApplier extends MsSymbolApplier {
if (!(dataType instanceof FunctionDefinition)) {
return false;
}
FunctionDefinition def = (FunctionDefinition) dataType;
FunctionDefinition def =
(FunctionDefinition) dataType.copy(applicator.getDataTypeManager());
try {
// Must use copy of function definition with preserved function name.
// While not ideal, this prevents applying an incorrect function name
// with an IMPORTED source type
def.setName(function.getName());
}
catch (InvalidNameException | DuplicateNameException e) {
throw new RuntimeException("unexpected exception", e);
}
ApplyFunctionSignatureCmd sigCmd =
new ApplyFunctionSignatureCmd(address, def, SourceType.IMPORTED);
if (!sigCmd.applyTo(applicator.getProgram(), monitor)) {