yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Fixed NPE possible when background thread is mutating the function

Browse source
This commit is contained in:
dragonmacher 2019-06-06 14:42:08 -04:00
parent 4876b10a5a
commit 60be8e151b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/util/FunctionParameterFieldLocation.java
View file

@ -27,7 +27,7 @@ public class FunctionParameterFieldLocation extends FunctionSignatureFieldLocati
/** /**
* Construct a new FunctionParameterFieldLocation object. * Construct a new FunctionParameterFieldLocation object.
* *
* @param the program of the location * @param program the program of the location
* @param locationAddr the address of the listing location (i.e., referent code unit) * @param locationAddr the address of the listing location (i.e., referent code unit)
* @param functionAddr the function address * @param functionAddr the function address
* @param charOffset the position within the function signature string for this location. * @param charOffset the position within the function signature string for this location.
@ -38,7 +38,10 @@ public class FunctionParameterFieldLocation extends FunctionSignatureFieldLocati
Address functionAddr, int charOffset, String signature, Parameter parameter) { Address functionAddr, int charOffset, String signature, Parameter parameter) {
super(program, locationAddr, functionAddr, charOffset, signature); super(program, locationAddr, functionAddr, charOffset, signature);
this.parameter = parameter; this.parameter = parameter;
this.ordinal = parameter.getOrdinal();
// note: the parameter can be null if it is deleted in the background while this
// location is being created
this.ordinal = parameter == null ? -1 : parameter.getOrdinal();
} }
/** /**
@ -51,7 +54,7 @@ public class FunctionParameterFieldLocation extends FunctionSignatureFieldLocati
/** /**
* Returns the parameter associated with this location. This value can be null if the * Returns the parameter associated with this location. This value can be null if the
* parameters are deleted from the function associated with the address of the parameter. * parameters are deleted from the function associated with the address of the parameter.
* @return * @return the parameter
*/ */
public Parameter getParameter() { public Parameter getParameter() {
return parameter; return parameter;