From 846cfd259c69f75eb543ead59ffa4d1ae586a6c2 Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Mon, 18 Nov 2024 10:24:02 -0800
Subject: [PATCH] fix incorrect search joining logic, in cases where a key has
 been evicted

---
 src/dbgi/dbgi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/dbgi/dbgi.c b/src/dbgi/dbgi.c
index 1ada55ee..bdee70fa 100644
--- a/src/dbgi/dbgi.c
+++ b/src/dbgi/dbgi.c
@@ -575,6 +575,7 @@ di_close(DI_Key *key)
 internal RDI_Parsed *
 di_rdi_from_key(DI_Scope *scope, DI_Key *key, U64 endt_us)
 {
+  ProfBeginFunction();
   RDI_Parsed *result = &di_rdi_parsed_nil;
   if(key->path.size != 0)
   {
@@ -636,6 +637,7 @@ di_rdi_from_key(DI_Scope *scope, DI_Key *key, U64 endt_us)
     }
     scratch_end(scratch);
   }
+  ProfEnd();
   return result;
 }
 
@@ -1421,7 +1423,7 @@ di_search_thread__entry_point(void *p)
     
     //- rjf: list -> array
     DI_SearchItemArray items = {0};
-    if(!cancelled)
+    if(arena != 0 && !cancelled)
     {
       items.count = items_list.total_count;
       items.v = push_array(arena, DI_SearchItem, items.count);