github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-5526 Correct CreateThunkCmd NPE

Browse Source
This commit is contained in:
ghidra1
2025-09-25 13:03:49 -04:00
parent 136a28d603
commit cae8caac14
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java
View File

@@ -563,14 +563,15 @@ public class CreateThunkFunctionCmd extends BackgroundCommand<Program> {
Listing listing = program.getListing();
Instruction instr = listing.getInstructionAt(entry);
if (instr == null) {
return null;
}
// if there is no pcode, go to the next instruction
// assume fallthrough (ie. x86 instruction ENDBR64)
// TODO: at some point, might need to do a NOP detection
if (instr.getPcode().length == 0) {
instr = listing.getInstructionAfter(entry);
while (instr != null && instr.getPcode().length == 0) {
instr = listing.getInstructionAfter(instr.getAddress());
}
if (instr == null) {
return null;
}
FlowType flowType;