From 3360d97e3752439b14d1cb7d93e18b59e6d5191f Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Tue, 19 May 2026 11:14:19 -0700
Subject: [PATCH] fix eval space creation for nil entities

---
 src/dbg_info/dbg_info.c  |  2 +-
 src/raddbg/raddbg_core.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/dbg_info/dbg_info.c b/src/dbg_info/dbg_info.c
index 78fdcb29..5cbbf1b6 100644
--- a/src/dbg_info/dbg_info.c
+++ b/src/dbg_info/dbg_info.c
@@ -1306,7 +1306,7 @@ di_search_artifact_create(String8 key, B32 *cancel_signal, B32 *retry_out, U64 *
     }
     lane_sync();
     
-    //- rjf: sort records if we have a query
+    //- rjf: sort records
     if(!cancelled) ProfScope("sort records")
     {
       //- rjf: set up common data
diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index c2dc44b7..f8dd89a9 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -704,9 +704,13 @@ rd_ctrl_entity_from_eval_space(E_Space space)
 internal E_Space
 rd_eval_space_from_ctrl_entity(D_Entity *entity, E_SpaceKind kind)
 {
-  E_Space space = e_space_make(kind);
-  space.u64s[0] = (((U64)entity->handle.machine_id) << 32) | (((U64)entity->handle.controller_kind) << 0);
-  space.u64s[1] = entity->handle.entity_id;
+  E_Space space = {0};
+  if(entity != &d_entity_nil)
+  {
+    space = e_space_make(kind);
+    space.u64s[0] = (((U64)entity->handle.machine_id) << 32) | (((U64)entity->handle.controller_kind) << 0);
+    space.u64s[1] = entity->handle.entity_id;
+  }
   return space;
 }