[Bf-blender-cvs] [71071a25a04] master: Fix crash on File > Link or Append

Julian Eisel noreply at git.blender.org
Fri Dec 2 19:10:10 CET 2022


Commit: 71071a25a046c90f17ae3a6c4bde2a21470a0e4e
Author: Julian Eisel
Date:   Fri Dec 2 19:07:42 2022 +0100
Branches: master
https://developer.blender.org/rB71071a25a046c90f17ae3a6c4bde2a21470a0e4e

Fix crash on File > Link or Append

Would attempt to destruct memory of a null pointer. Use `MEM_delete()`
instead of manual destruction, which allows this case (NOP then).

===================================================================

M	source/blender/blenkernel/intern/asset.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/asset.cc b/source/blender/blenkernel/intern/asset.cc
index 74605af815d..8fa5fc5842b 100644
--- a/source/blender/blenkernel/intern/asset.cc
+++ b/source/blender/blenkernel/intern/asset.cc
@@ -33,8 +33,8 @@ AssetMetaData *BKE_asset_metadata_create()
 
 void BKE_asset_metadata_free(AssetMetaData **asset_data)
 {
-  (*asset_data)->~AssetMetaData();
-  MEM_SAFE_FREE(*asset_data);
+  MEM_delete(*asset_data);
+  *asset_data = nullptr;
 }
 
 AssetMetaData::~AssetMetaData()



More information about the Bf-blender-cvs mailing list