Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-01-20 03:29:32 +0300
committerCampbell Barton <campbell@blender.org>2022-01-20 03:59:20 +0300
commite3f9d9b206e60f61c80abc6b162f60c6fdcfdc6e (patch)
tree9aa1ec917d777f957b8925c90b899407b2b84933 /source/blender/blenkernel/intern/mesh_merge.c
parentb7fe27314b25a7220a1cc5d5bc023d8776f55d9e (diff)
Cleanup: quiet ASAN warnings for divide by zero & NULL memcpy args
No functional changes as the inf value was never used & memcpy args were only NULL when the size to copy was zero.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_merge.c')
-rw-r--r--source/blender/blenkernel/intern/mesh_merge.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c
index 0115a70a52a..134a1344f83 100644
--- a/source/blender/blenkernel/intern/mesh_merge.c
+++ b/source/blender/blenkernel/intern/mesh_merge.c
@@ -615,10 +615,18 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh,
}
/* Copy over data. #CustomData_add_layer can do this, need to look it up. */
- memcpy(result->mvert, mvert, sizeof(MVert) * STACK_SIZE(mvert));
- memcpy(result->medge, medge, sizeof(MEdge) * STACK_SIZE(medge));
- memcpy(result->mloop, mloop, sizeof(MLoop) * STACK_SIZE(mloop));
- memcpy(result->mpoly, mpoly, sizeof(MPoly) * STACK_SIZE(mpoly));
+ if (STACK_SIZE(mvert)) {
+ memcpy(result->mvert, mvert, sizeof(MVert) * STACK_SIZE(mvert));
+ }
+ if (STACK_SIZE(medge)) {
+ memcpy(result->medge, medge, sizeof(MEdge) * STACK_SIZE(medge));
+ }
+ if (STACK_SIZE(mloop)) {
+ memcpy(result->mloop, mloop, sizeof(MLoop) * STACK_SIZE(mloop));
+ }
+ if (STACK_SIZE(mpoly)) {
+ memcpy(result->mpoly, mpoly, sizeof(MPoly) * STACK_SIZE(mpoly));
+ }
MEM_freeN(mvert);
MEM_freeN(medge);