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

Merge remote-tracking branch 'origin/GP-1-dragonamcher-decompiler-stack-trace-10-29-21'

Browse Source
This commit is contained in:
Ryan Kurtz
2021-10-29 11:40:28 -04:00
parent 536958af4d 04c0f0ef93
commit 59402a2951
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Decompiler/src/main/java/ghidra/app/plugin/core/decompile/actions/AbstractDecompilerAction.java
+2 -1
View File
@@ -31,6 +31,7 @@ import ghidra.program.model.pcode.*;
import ghidra.program.model.symbol.Symbol; import ghidra.program.model.symbol.Symbol;
import ghidra.program.model.symbol.SymbolTable; import ghidra.program.model.symbol.SymbolTable;
import ghidra.program.util.ProgramLocation; import ghidra.program.util.ProgramLocation;
import ghidra.util.UndefinedFunction;
import ghidra.util.data.DataTypeParser.AllowedDataTypes; import ghidra.util.data.DataTypeParser.AllowedDataTypes;
/** /**
@@ -216,7 +217,7 @@ public abstract class AbstractDecompilerAction extends DockingAction {
// prefer the decompiler's function reference over the program location's address // prefer the decompiler's function reference over the program location's address
Function function = getFunction(context); Function function = getFunction(context);
if (function != null) { if (function != null && !(function instanceof UndefinedFunction)) {
return function.getSymbol(); return function.getSymbol();
} }