Merge remote-tracking branch 'origin/patch' into Ghidra_12.0

This commit is contained in:
ghidra1 2025-09-25 13:53:31 -04:00
commit 531d53f8f8

View file

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