From c12669fe501bfd77e916e75649cb8e4022729c50 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 25 Jul 2022 22:10:20 +0200
Subject: [PATCH] this should fix the mmeory leak

---
 src/fsfw/datapoollocal/LocalDataPoolManager.cpp | 11 +++++------
 unittests/mocks/LocalPoolOwnerBase.cpp          | 10 +++++-----
 unittests/mocks/LocalPoolOwnerBase.h            | 11 +++++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/fsfw/datapoollocal/LocalDataPoolManager.cpp b/src/fsfw/datapoollocal/LocalDataPoolManager.cpp
index 45ef9567a..7a18b7bf7 100644
--- a/src/fsfw/datapoollocal/LocalDataPoolManager.cpp
+++ b/src/fsfw/datapoollocal/LocalDataPoolManager.cpp
@@ -209,9 +209,9 @@ ReturnValue_t LocalDataPoolManager::handleNotificationSnapshot(HkReceiver& recei
     }
 
     /* Prepare and send update snapshot */
-    timeval now;
+    timeval now{};
     Clock::getClock_timeval(&now);
-    CCSDSTime::CDS_short cds;
+    CCSDSTime::CDS_short cds{};
     CCSDSTime::convertToCcsds(&cds, &now);
     HousekeepingSnapshot updatePacket(
         reinterpret_cast<uint8_t*>(&cds), sizeof(cds),
@@ -245,9 +245,9 @@ ReturnValue_t LocalDataPoolManager::handleNotificationSnapshot(HkReceiver& recei
     }
 
     /* Prepare and send update snapshot */
-    timeval now;
+    timeval now{};
     Clock::getClock_timeval(&now);
-    CCSDSTime::CDS_short cds;
+    CCSDSTime::CDS_short cds{};
     CCSDSTime::convertToCcsds(&cds, &now);
     HousekeepingSnapshot updatePacket(
         reinterpret_cast<uint8_t*>(&cds), sizeof(cds),
@@ -291,8 +291,7 @@ ReturnValue_t LocalDataPoolManager::addUpdateToStore(HousekeepingSnapshot& updat
 
 void LocalDataPoolManager::handleChangeResetLogic(DataType type, DataId dataId,
                                                   MarkChangedIF* toReset) {
-  HkUpdateResetList& listRef = hkUpdateResetList;
-  for (auto& changeInfo : listRef) {
+  for (auto& changeInfo : hkUpdateResetList) {
     if (changeInfo.dataType != type) {
       continue;
     }
diff --git a/unittests/mocks/LocalPoolOwnerBase.cpp b/unittests/mocks/LocalPoolOwnerBase.cpp
index f269e066a..df295b958 100644
--- a/unittests/mocks/LocalPoolOwnerBase.cpp
+++ b/unittests/mocks/LocalPoolOwnerBase.cpp
@@ -19,12 +19,12 @@ ReturnValue_t LocalPoolOwnerBase::initializeHkManager() {
 ReturnValue_t LocalPoolOwnerBase::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                           LocalDataPoolManager &poolManager) {
   // Default initialization empty for now.
-  localDataPoolMap.emplace(lpool::uint8VarId, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(lpool::floatVarId, new PoolEntry<float>({0}));
-  localDataPoolMap.emplace(lpool::uint32VarId, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(lpool::uint8VarId, &u8PoolEntry);
+  localDataPoolMap.emplace(lpool::floatVarId, &floatPoolEntry);
+  localDataPoolMap.emplace(lpool::uint32VarId, &u32PoolEntry);
 
-  localDataPoolMap.emplace(lpool::uint16Vec3Id, new PoolEntry<uint16_t>({0, 0, 0}));
-  localDataPoolMap.emplace(lpool::int64Vec2Id, new PoolEntry<int64_t>({0, 0}));
+  localDataPoolMap.emplace(lpool::uint16Vec3Id, &u16VecPoolEntry);
+  localDataPoolMap.emplace(lpool::int64Vec2Id, &i64VecPoolEntry);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/unittests/mocks/LocalPoolOwnerBase.h b/unittests/mocks/LocalPoolOwnerBase.h
index 329aa0b37..3233d5d49 100644
--- a/unittests/mocks/LocalPoolOwnerBase.h
+++ b/unittests/mocks/LocalPoolOwnerBase.h
@@ -7,10 +7,12 @@
 #include <fsfw/datapoollocal/LocalPoolVariable.h>
 #include <fsfw/datapoollocal/LocalPoolVector.h>
 #include <fsfw/datapoollocal/StaticLocalDataSet.h>
+#include "fsfw/datapool/PoolEntry.h"
+
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/objectmanager/SystemObject.h>
 
-#include "../mocks/MessageQueueMock.h"
+#include "mocks/MessageQueueMock.h"
 #include "tests/TestsConfig.h"
 
 namespace lpool {
@@ -164,10 +166,15 @@ class LocalPoolOwnerBase : public SystemObject, public HasLocalDataPoolIF {
   gp_id_t changedPoolVariableGpid;
   store_address_t storeIdForChangedVariable;
 
+  PoolEntry<uint8_t> u8PoolEntry = PoolEntry<uint8_t>({0});
+  PoolEntry<float> floatPoolEntry = PoolEntry<float>({0});
+  PoolEntry<uint32_t> u32PoolEntry = PoolEntry<uint32_t>({0});
+  PoolEntry<uint16_t> u16VecPoolEntry = PoolEntry<uint16_t>({0, 0, 0});
+  PoolEntry<int64_t> i64VecPoolEntry = PoolEntry<int64_t>({0, 0});
+
   lp_var_t<uint8_t> testUint8 = lp_var_t<uint8_t>(this, lpool::uint8VarId);
   lp_var_t<float> testFloat = lp_var_t<float>(this, lpool::floatVarId);
   lp_var_t<uint32_t> testUint32 = lp_var_t<uint32_t>(this, lpool::uint32VarId);
-
   lp_vec_t<uint16_t, 3> testUint16Vec = lp_vec_t<uint16_t, 3>(this, lpool::uint16Vec3Id);
   lp_vec_t<int64_t, 2> testInt64Vec = lp_vec_t<int64_t, 2>(this, lpool::int64Vec2Id);