[Bf-blender-cvs] [ce5b8b4c809] refactor-mesh-remove-pointers: Avoid possibly passing null pointer to MEM_freeN

Hans Goudey noreply at git.blender.org
Thu Sep 1 23:55:17 CEST 2022


Commit: ce5b8b4c8095062d8028f955af29d362bc43cdc1
Author: Hans Goudey
Date:   Thu Sep 1 16:31:53 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rBce5b8b4c8095062d8028f955af29d362bc43cdc1

Avoid possibly passing null pointer to MEM_freeN

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

M	source/blender/blenkernel/intern/fluid.c

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

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index b9ceffdf2b8..7c1dc4361f7 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -1093,7 +1093,7 @@ static void obstacles_from_mesh(Object *coll_ob,
     if (vert_vel) {
       MEM_freeN(vert_vel);
     }
-    MEM_freeN(verts);
+    MEM_SAFE_FREE(verts);
     BKE_id_free(NULL, me);
   }
 }
@@ -2174,8 +2174,8 @@ static void emit_from_mesh(
     if (vert_vel) {
       MEM_freeN(vert_vel);
     }
-    MEM_freeN(verts);
-    MEM_freeN(vert_normals);
+    MEM_SAFE_FREE(verts);
+    MEM_SAFE_FREE(vert_normals);
     BKE_id_free(NULL, me);
   }
 }



More information about the Bf-blender-cvs mailing list