From db64e4f148cfd3b6de96fe15df32e20cbef7e037 Mon Sep 17 00:00:00 2001
From: Dustin Brown <me@dubrowgn.com>
Date: Wed, 15 Apr 2026 07:47:02 -0600
Subject: [PATCH] Null check result of ecs_query_str()

`ecs_query_str()` returns `NULL` for empty queries, so add a null check before using the results.
---
 flecs_ecs/src/core/utility/traits/query_api.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/flecs_ecs/src/core/utility/traits/query_api.rs b/flecs_ecs/src/core/utility/traits/query_api.rs
index 3811e24f..a55c16fb 100644
--- a/flecs_ecs/src/core/utility/traits/query_api.rs
+++ b/flecs_ecs/src/core/utility/traits/query_api.rs
@@ -920,6 +920,10 @@ where
     fn to_string(&self) -> String {
         let query = self.query_ptr();
         let result: *mut c_char = unsafe { sys::ecs_query_str(query as *const _) };
+        if result.is_null() {
+            return String::new();
+        }
+
         let rust_string =
             String::from(unsafe { core::ffi::CStr::from_ptr(result).to_str().unwrap() });
         unsafe {