Visual cloning: check for null children and recursively delete cloned…

… visuals if failure occurs (#434) Signed-off-by: Ashton Larkin <[email protected]>
gazebosim · Sep 25, 2021 · 35087de · 35087de
1 parent 45a49f0
commit 35087de
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/include/ignition/rendering/base/BaseVisual.hh b/include/ignition/rendering/base/BaseVisual.hh
@@ -528,8 +528,14 @@ namespace ignition
       {
         NodePtr child = it->second;
         VisualPtr visual = std::dynamic_pointer_cast<Visual>(child);
-        if (nullptr != visual)
-          visual->Clone("", result);
+        // recursively delete all cloned visuals if the child cannot be
+        // retrieved, or if cloning the child visual failed
+        if (!visual || !visual->Clone("", result))
+        {
+          ignerr << "Cloning a child visual failed.\n";
+          scene_->DestroyVisual(result, true);
+          return nullptr;
+        }
       }
 
       for (unsigned int i = 0; i < this->GeometryCount(); ++i)