TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1495 from Azaezel/alpha41/safeSafties

Browse source 
add extra safeties to safe_delete macros
This commit is contained in:
Brian Roberts 2025-06-06 10:56:46 -05:00 • committed by GitHub
commit ccd30a19cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/core/util/safeDelete.h
View file

@ -34,7 +34,7 @@
/// @param a Object to delete /// @param a Object to delete
/// @see #SAFE_DELETE_ARRAY(), #SAFE_DELETE_OBJECT(), #SAFE_FREE(), #SAFE_FREE_REFERENCE() /// @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 #undef SAFE_DELETE_ARRAY
@ -44,7 +44,7 @@
/// @param a Array to delete /// @param a Array to delete
/// @see #SAFE_DELETE(), #SAFE_DELETE_OBJECT(), #SAFE_FREE(), #SAFE_FREE_REFERENCE() /// @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 #undef SAFE_DELETE_OBJECT

3
Engine/source/gfx/gfxTextureObject.cpp
View file

@ -144,7 +144,8 @@ GFXTextureObject::~GFXTextureObject()
void GFXTextureObject::destroySelf() void GFXTextureObject::destroySelf()
{ {
mDevice->mTextureManager->requestDeleteTexture(this); if (mDevice && mDevice->mTextureManager)
mDevice->mTextureManager->requestDeleteTexture(this);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------