Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-29 02:16:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-2864 corrected PDB function definition use by FunctionSymbolApplier

Browse Source
This commit is contained in:
ghidra1
2022-11-18 14:52:02 -05:00
parent 6ade149f4a
commit 4e6d2316f7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/FunctionSymbolApplier.java
+13 -3
View File
@@ -30,8 +30,8 @@ import ghidra.program.model.data.FunctionDefinition;
import ghidra.program.model.lang.Register; import ghidra.program.model.lang.Register;
import ghidra.program.model.listing.*; import ghidra.program.model.listing.*;
import ghidra.program.model.symbol.SourceType; import ghidra.program.model.symbol.SourceType;
import ghidra.util.exception.AssertException; import ghidra.util.InvalidNameException;
import ghidra.util.exception.CancelledException; import ghidra.util.exception.*;
import ghidra.util.task.TaskMonitor; import ghidra.util.task.TaskMonitor;
/** /**
@@ -328,7 +328,17 @@ public class FunctionSymbolApplier extends MsSymbolApplier {
if (!(dataType instanceof FunctionDefinition)) { if (!(dataType instanceof FunctionDefinition)) {
return false; 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 = ApplyFunctionSignatureCmd sigCmd =
new ApplyFunctionSignatureCmd(address, def, SourceType.IMPORTED); new ApplyFunctionSignatureCmd(address, def, SourceType.IMPORTED);
if (!sigCmd.applyTo(applicator.getProgram(), monitor)) { if (!sigCmd.applyTo(applicator.getProgram(), monitor)) {