[Bf-blender-cvs] [b937b6d0695] master: Cleanup: silence address sanitizer warning about NULL + 0

Brecht Van Lommel noreply at git.blender.org
Tue Oct 26 15:49:20 CEST 2021


Commit: b937b6d06956327578e82a10f4136377758425aa
Author: Brecht Van Lommel
Date:   Tue Oct 26 15:39:25 2021 +0200
Branches: master
https://developer.blender.org/rBb937b6d06956327578e82a10f4136377758425aa

Cleanup: silence address sanitizer warning about NULL + 0

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

M	source/blender/makesrna/intern/rna_attribute.c

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

diff --git a/source/blender/makesrna/intern/rna_attribute.c b/source/blender/makesrna/intern/rna_attribute.c
index f1831bca0fe..dbf20896463 100644
--- a/source/blender/makesrna/intern/rna_attribute.c
+++ b/source/blender/makesrna/intern/rna_attribute.c
@@ -323,8 +323,10 @@ static void rna_AttributeGroup_next_domain(ID *id,
                                            int(skip)(CollectionPropertyIterator *iter, void *data))
 {
   do {
-    CustomDataLayer *prev_layers = (CustomDataLayer *)iter->internal.array.endptr -
-                                   iter->internal.array.length;
+    CustomDataLayer *prev_layers = (iter->internal.array.endptr == NULL) ?
+                                       NULL :
+                                       (CustomDataLayer *)iter->internal.array.endptr -
+                                           iter->internal.array.length;
     CustomData *customdata = BKE_id_attributes_iterator_next_domain(id, prev_layers);
     if (customdata == NULL) {
       return;



More information about the Bf-blender-cvs mailing list