From a9f3692373831653730a3fc06adfa1378540878c Mon Sep 17 00:00:00 2001
From: ghidra1 <ghidra1@users.noreply.github.com>
Date: Thu, 25 May 2023 12:14:32 -0400
Subject: [PATCH] GP-3493 corrected ELF PT_NOTE markup NPE

---
 .../util/bin/format/elf/info/StandardElfInfoProducer.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java
index 9724e2f6df..9ae8b46ab4 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/info/StandardElfInfoProducer.java
@@ -15,11 +15,10 @@
  */
 package ghidra.app.util.bin.format.elf.info;
 
+import java.io.IOException;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import java.io.IOException;
-
 import ghidra.app.util.bin.*;
 import ghidra.app.util.bin.format.elf.*;
 import ghidra.app.util.bin.format.elf.info.ElfInfoItem.ReaderFunc;
@@ -90,6 +89,9 @@ public class StandardElfInfoProducer implements ElfInfoProducer {
 			monitor.checkCancelled();
 
 			Address addr = elfLoadHelper.findLoadAddress(elfProgramHeader, 0);
+			if (addr == null) {
+				continue;
+			}
 			MemoryBlock memBlock = memory.getBlock(addr);
 			if (memBlock == null) {
 				continue;