From 7912eab85eb4753452d3f7b8081ee91f589a297c Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Fri, 17 Oct 2025 10:15:46 +0900
Subject: [PATCH] [CPU] Check for null when returning machine code ptr

---
 src/xenia/cpu/function.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/xenia/cpu/function.cc b/src/xenia/cpu/function.cc
index 507395d42..ecbb239d6 100644
--- a/src/xenia/cpu/function.cc
+++ b/src/xenia/cpu/function.cc
@@ -120,8 +120,13 @@ uintptr_t GuestFunction::MapGuestAddressToMachineCode(
 
 uint32_t GuestFunction::MapMachineCodeToGuestAddress(
     uintptr_t host_address) const {
-  auto entry = LookupMachineCodeOffset(static_cast<uint32_t>(
-      host_address - reinterpret_cast<uintptr_t>(machine_code())));
+  void* code = machine_code();
+  if (!code) {
+    assert_always("MapMachineCodeToGuestAddress called with no compiled code");
+    return address();
+  }
+  auto entry = LookupMachineCodeOffset(
+      static_cast<uint32_t>(host_address - reinterpret_cast<uintptr_t>(code)));
   return entry ? entry->guest_address : address();
 }