From c480f00cf7447f7f0906a9db52d46264751496c2 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 4 Jun 2020 15:38:51 -0500 Subject: [PATCH 1/2] Fix segfault in the Breadcrumbs system Signed-off-by: Addisu Z. Taddese --- src/systems/breadcrumbs/Breadcrumbs.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/systems/breadcrumbs/Breadcrumbs.cc b/src/systems/breadcrumbs/Breadcrumbs.cc index 26449732c7..27e4ddfbd3 100644 --- a/src/systems/breadcrumbs/Breadcrumbs.cc +++ b/src/systems/breadcrumbs/Breadcrumbs.cc @@ -245,7 +245,8 @@ void Breadcrumbs::PreUpdate(const ignition::gazebo::UpdateInfo &_info, } std::set processedEntities; - for (const auto &e : this->pendingGeometryUpdate) { + for (const auto &e : this->pendingGeometryUpdate) + { Entity perf = _ecm.EntityByComponents(components::Performer(), components::ParentEntity(e)); if (perf == kNullEntity) @@ -282,16 +283,15 @@ void Breadcrumbs::PreUpdate(const ignition::gazebo::UpdateInfo &_info, auto td = _info.simTime - it->second; if (td > this->disablePhysicsTime) { - auto nameComp = _ecm.Component(it->first); + auto name = _ecm.Component(it->first)->Data(); if (!this->MakeStatic(it->first, _ecm)) { - ignerr << "Failed to make breadcrumb '" << nameComp->Data() + ignerr << "Failed to make breadcrumb '" << name << "' static." << std::endl; } else { - ignmsg << "Breadcrumb '" << nameComp->Data() - << "' is now static." << std::endl; + ignmsg << "Breadcrumb '" << name << "' is now static." << std::endl; } this->autoStaticEntities.erase(it++); } From f0e5d6a43eefd4e67f7f37f9718d8b7fc411c84d Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 4 Jun 2020 21:04:59 -0500 Subject: [PATCH 2/2] Update changelog Signed-off-by: Addisu Z. Taddese --- Changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index f89ed96518..d48a11f541 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ ## Ignition Gazebo 2.x +### Ignition Gazebo 2.XX.XX (2020-XX-XX) + +1. Fix segfault in the Breadcrumbs system + * [Pull Request 180](https://github.com/ignitionrobotics/ign-gazebo/pull/180) + ### Ignition Gazebo 2.19.0 (2020-06-02) 1. Use updated model names for spawned models when generating SDFormat