From 444aa1dcb36d78ff1f0fe66f3ef5b1f19c1c2306 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 13 Jan 2021 09:58:26 +0100
Subject: [PATCH] Fix data == nullptr in ice_conversions
---
.../libraries/armem/memory/ice_conversions.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp b/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp
index 2cb0bbd87..461f9d6b5 100644
--- a/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp
+++ b/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp
@@ -52,14 +52,20 @@ namespace armarx
{
detail::toIceItem(ice, data);
- ice.data = data.data()->getResult();
+ if (data.data())
+ {
+ ice.data = data.data()->getResult();
+ }
toIce(ice.metadata, data.metadata());
}
void armem::fromIce(const data::EntityInstance& ice, EntityInstance& data)
{
detail::fromIceItem(ice, data);
- data.setData(aron::datanavigator::AronDataNavigator::FromAronData(ice.data));
+ if (ice.data)
+ {
+ data.setData(aron::datanavigator::AronDataNavigator::FromAronData(ice.data));
+ }
fromIce(ice.metadata, data.metadata());
}
--
GitLab