From 1f7a1b350b6c6883f90306d71de811c91ba4d079 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Mon, 10 Aug 2026 04:57:38 -0400 Subject: [PATCH] GP-0: Fixing NullPointerException importing an x64 PE with a zeroed UnwindInfoAddress in .pdata (Closing #9491) --- .../app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java index 7c9f13d013..b6d12f98b3 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries_X86.java @@ -139,7 +139,7 @@ public class ImageRuntimeFunctionEntries_X86 implements ImageRuntimeFunctionEntr public void markup(Program program, MessageLog log) throws DuplicateNameException, IOException { - if (beginAddress != 0 && !unwindInfo.hasChainedUnwindInfo()) { + if (beginAddress != 0 && (unwindInfo == null || !unwindInfo.hasChainedUnwindInfo())) { AbstractProgramLoader.markAsFunction(program, null, program.getImageBase().add(beginAddress)); }