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

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

Browse Source
This commit is contained in:
ghidra1
2025-09-25 13:53:31 -04:00
parent fb66e26452 9a20684330
commit 531d53f8f8
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;