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

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

Browse source
This commit is contained in:
ghidra1 2025-09-25 13:54:11 -04:00
commit 5ea1b04604
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/cmd/function/CreateThunkFunctionCmd.java
View file

@ -567,8 +567,8 @@ public class CreateThunkFunctionCmd extends BackgroundCommand<Program> {
// 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
while (instr != null && instr.getPcode().length == 0) {
instr = listing.getInstructionAfter(instr.getAddress());
if (instr != null && instr.getPcode().length == 0) {
instr = listing.getInstructionAfter(entry);
}
if (instr == null) {
return null;