From 2c15877d5af4dd2e2cc563059d87aca88b6fdb21 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Fri, 6 Jun 2025 10:45:05 -0500 Subject: [PATCH] add extra safeties to safe_delete macros --- Engine/source/core/util/safeDelete.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/core/util/safeDelete.h b/Engine/source/core/util/safeDelete.h index 5b5410416..325ef5385 100644 --- a/Engine/source/core/util/safeDelete.h +++ b/Engine/source/core/util/safeDelete.h @@ -34,7 +34,7 @@ /// @param a Object to delete /// @see #SAFE_DELETE_ARRAY(), #SAFE_DELETE_OBJECT(), #SAFE_FREE(), #SAFE_FREE_REFERENCE() //----------------------------------------------------------------------------- -#define SAFE_DELETE(a) {delete (a); (a) = NULL; } +#define SAFE_DELETE(a) {if((a) != NULL) { delete (a); (a) = NULL; } } #undef SAFE_DELETE_ARRAY @@ -44,7 +44,7 @@ /// @param a Array to delete /// @see #SAFE_DELETE(), #SAFE_DELETE_OBJECT(), #SAFE_FREE(), #SAFE_FREE_REFERENCE() //----------------------------------------------------------------------------- -#define SAFE_DELETE_ARRAY(a) { delete [] (a); (a) = NULL; } +#define SAFE_DELETE_ARRAY(a) { if((a) != NULL) { delete [] (a); (a) = NULL; } } #undef SAFE_DELETE_OBJECT