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

GP-4883 fix null exception in PropagateExternalParamsScript

Browse source
This commit is contained in:
ghidra007 2024-08-30 15:38:32 +00:00
parent 0e558caa3d
commit ecf5fca015
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Features/Base/ghidra_scripts/PropagateExternalParametersScript.java
View file

@ -31,6 +31,8 @@ import ghidra.program.model.symbol.*;
public class PropagateExternalParametersScript extends GhidraScript { public class PropagateExternalParametersScript extends GhidraScript {
private List<PushedParamInfo> results = new ArrayList<>(); private List<PushedParamInfo> results = new ArrayList<>();
private static final boolean PRINT_OPTYPE = false;
@Override @Override
public void run() throws Exception { public void run() throws Exception {
Listing listing = currentProgram.getListing(); Listing listing = currentProgram.getListing();
@ -149,7 +151,7 @@ public class PropagateExternalParametersScript extends GhidraScript {
Address thunkRefAddr = thunkRef.getFromAddress(); Address thunkRefAddr = thunkRef.getFromAddress();
CodeUnit cu = listing.getCodeUnitAt(thunkRefAddr); CodeUnit cu = listing.getCodeUnitAt(thunkRefAddr);
if(cu == null) { if (cu == null) {
// println("Referenced CodeUnit is null: " + thunkRefAddr); // println("Referenced CodeUnit is null: " + thunkRefAddr);
continue; continue;
} }
@ -300,10 +302,18 @@ public class PropagateExternalParametersScript extends GhidraScript {
numSkips--; numSkips--;
} }
else { else {
// if option is true add the value of the optype to the EOL comment
String opType = "";
if (PRINT_OPTYPE) {
opType = " " + toHexString(currentProgram.getListing()
.getInstructionAt(cu.getMinAddress())
.getOperandType(0),
false, true);
}
setEOLComment(cu.getMinAddress(), params[index].getDataType().getDisplayName() + setEOLComment(cu.getMinAddress(), params[index].getDataType().getDisplayName() +
" " + params[index].getName() + " for " + extFuncName); " " + params[index].getName() + " for " + extFuncName + opType);
// add the following to the EOL comment to see the value of the optype
// + " | " + ghidra.program.model.lang.OperandType.toString(currentProgram.getListing().getInstructionAt(cu.getMinAddress()).getOperandType(0))
addResult(params[index].getName(), params[index].getDataType(), addResult(params[index].getName(), params[index].getDataType(),
cu.getMinAddress(), extFuncName); cu.getMinAddress(), extFuncName);
index++; index++;