[Bf-blender-cvs] [80e5697b0ba] master: Cleanup: fix asan warnings

Jacques Lucke noreply at git.blender.org
Fri Feb 19 12:06:06 CET 2021


Commit: 80e5697b0ba8e5ce2a918980bc8d63668656afba
Author: Jacques Lucke
Date:   Fri Feb 19 12:05:59 2021 +0100
Branches: master
https://developer.blender.org/rB80e5697b0ba8e5ce2a918980bc8d63668656afba

Cleanup: fix asan warnings

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

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

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

diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index f455f83f5c5..248d2776678 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -1421,18 +1421,24 @@ static void socket_id_user_decrement(bNodeSocket *sock)
   switch ((eNodeSocketDatatype)sock->type) {
     case SOCK_OBJECT: {
       bNodeSocketValueObject *default_value = (bNodeSocketValueObject *)sock->default_value;
-      id_us_min(&default_value->value->id);
+      if (default_value->value != nullptr) {
+        id_us_min(&default_value->value->id);
+      }
       break;
     }
     case SOCK_IMAGE: {
       bNodeSocketValueImage *default_value = (bNodeSocketValueImage *)sock->default_value;
-      id_us_min(&default_value->value->id);
+      if (default_value->value != nullptr) {
+        id_us_min(&default_value->value->id);
+      }
       break;
     }
     case SOCK_COLLECTION: {
       bNodeSocketValueCollection *default_value = (bNodeSocketValueCollection *)
                                                       sock->default_value;
-      id_us_min(&default_value->value->id);
+      if (default_value->value != nullptr) {
+        id_us_min(&default_value->value->id);
+      }
       break;
     }
     case SOCK_FLOAT:



More information about the Bf-blender-cvs mailing list