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

Browse source 
'origin/GP-5639-dragonmacher-decompiler-exceptions' (Closes #8111,
Closes #8114)
This commit is contained in:
Ryan Kurtz 2025-05-07 10:40:55 -04:00
commit f9b3499231
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/location/FunctionNameDecompilerLocation.java
View file

@ -37,6 +37,11 @@ public class FunctionNameDecompilerLocation extends FunctionNameFieldLocation
this.info = info; this.info = info;
} }
public FunctionNameDecompilerLocation() {
// for restoring from xml
info = new DecompilerLocationInfo();
}
@Override @Override
public Address getFunctionEntryPoint() { public Address getFunctionEntryPoint() {
return info.getFunctionEntryPoint(); return info.getFunctionEntryPoint();

5
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/location/VariableDecompilerLocation.java
View file

@ -38,6 +38,11 @@ public class VariableDecompilerLocation extends VariableLocFieldLocation
this.info = info; this.info = info;
} }
public VariableDecompilerLocation() {
// for restoring from xml
info = new DecompilerLocationInfo();
}
@Override @Override
public Address getFunctionEntryPoint() { public Address getFunctionEntryPoint() {
return info.getFunctionEntryPoint(); return info.getFunctionEntryPoint();

4
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunctionDBUtil.java
View file

@ -517,6 +517,10 @@ public class HighFunctionDBUtil {
public static Variable getFunctionVariable(HighSymbol highSymbol) { public static Variable getFunctionVariable(HighSymbol highSymbol) {
if (highSymbol == null) {
return null;
}
HighFunction highFunction = highSymbol.getHighFunction(); HighFunction highFunction = highSymbol.getHighFunction();
Function function = highFunction.getFunction(); Function function = highFunction.getFunction();
HighVariable highVar = highSymbol.getHighVariable(); HighVariable highVar = highSymbol.getHighVariable();