From eb16898b3299c7b27ee841b5a460e446b9030acf Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Mon, 12 Feb 2024 12:28:03 -0500
Subject: [PATCH] GP-4217: Map null to null, not NPE

---
 .../trace/database/guest/DBTraceGuestPlatform.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java
index f71fea039c..0d989c4ef1 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/guest/DBTraceGuestPlatform.java
@@ -310,6 +310,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
 
 	@Override
 	public Address mapHostToGuest(Address hostAddress) {
+		if (hostAddress == null) {
+			return null;
+		}
 		try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
 			Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
 				rangesByHostAddress.floorEntry(hostAddress);
@@ -322,6 +325,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
 
 	@Override
 	public AddressRange mapHostToGuest(AddressRange hostRange) {
+		if (hostRange == null) {
+			return null;
+		}
 		try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
 			Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
 				rangesByHostAddress.floorEntry(hostRange.getMinAddress());
@@ -350,6 +356,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
 
 	@Override
 	public Address mapGuestToHost(Address guestAddress) {
+		if (guestAddress == null) {
+			return null;
+		}
 		try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
 			Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
 				rangesByGuestAddress.floorEntry(guestAddress);
@@ -362,6 +371,9 @@ public class DBTraceGuestPlatform extends DBAnnotatedObject
 
 	@Override
 	public AddressRange mapGuestToHost(AddressRange guestRange) {
+		if (guestRange == null) {
+			return null;
+		}
 		try (LockHold hold = LockHold.lock(manager.lock.readLock())) {
 			Entry<Address, DBTraceGuestPlatformMappedRange> floorEntry =
 				rangesByGuestAddress.floorEntry(guestRange.getMinAddress());