[Collision] Secure pointers dereferences (#4819)

sofa-framework · Jul 11, 2024 · 93933a5 · 93933a5
1 parent 3bfaa78
commit 93933a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h b/Sofa/Component/Collision/Geometry/src/sofa/component/collision/geometry/SphereModel.h
@@ -152,8 +152,12 @@ class SphereCollisionModel : public core::CollisionModel
 
             context->addObject(obj);
         }
+        else
+        {
+            obj = sofa::core::objectmodel::New<T>();
+        }
 
-        if (arg) obj->parse(arg);
+        if (arg && obj) obj->parse(arg);
 
         return obj;
     }

diff --git a/...ollision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h b/...ollision/Response/Contact/src/sofa/component/collision/response/contact/ContactListener.h
@@ -116,7 +116,7 @@ class SOFA_COMPONENT_COLLISION_RESPONSE_CONTACT_API ContactListener : public vir
         std::string collModelPath1;
         std::string collModelPath2;
 
-        if(arg)
+        if(arg && context)
         {
             collModelPath1 = arg->getAttribute(std::string("collisionModel1"), "" );
             collModelPath2 = arg->getAttribute(std::string("collisionModel2"), "" );