From f7b7c0827be1f2162eb7de1ea4a0e0939e0360b5 Mon Sep 17 00:00:00 2001
From: Robert Yevdokimov <105675984+ryevdokimov@users.noreply.github.com>
Date: Mon, 3 Nov 2025 17:37:55 -0600
Subject: [PATCH] Jolt: Add null checks to jolt_free and jolt_aligned_free

---
 modules/jolt_physics/jolt_globals.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/jolt_physics/jolt_globals.cpp b/modules/jolt_physics/jolt_globals.cpp
index bde79a23ecd..9b419ca63fc 100644
--- a/modules/jolt_physics/jolt_globals.cpp
+++ b/modules/jolt_physics/jolt_globals.cpp
@@ -53,6 +53,9 @@ void *jolt_realloc(void *p_mem, size_t p_old_size, size_t p_new_size) {
 }
 
 void jolt_free(void *p_mem) {
+	if (unlikely(p_mem == nullptr)) {
+		return;
+	}
 	Memory::free_static(p_mem);
 }
 
@@ -61,6 +64,9 @@ void *jolt_aligned_alloc(size_t p_size, size_t p_alignment) {
 }
 
 void jolt_aligned_free(void *p_mem) {
+	if (unlikely(p_mem == nullptr)) {
+		return;
+	}
 	Memory::free_aligned_static(p_mem);
 }