Refs #15831: Fix memory leak in is_active_tests

Signed-off-by: jparisu <[email protected]>
eProsima · Oct 11, 2022 · 4d6a39d · 4d6a39d
1 parent 11e1fb6
commit 4d6a39d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/cpp/StatisticsBackendData.cpp b/src/cpp/StatisticsBackendData.cpp
@@ -367,7 +367,7 @@ void StatisticsBackendData::stop_monitor(
 
     // The monitor is inactive
     // NOTE: for test sake, this is not always set
-    if (database_->is_entity_present(monitor_id))
+    if (database_ && database_->is_entity_present(monitor_id))
     {
         database_->change_entity_status(monitor_id, false);
     }

diff --git a/test/unittest/StatisticsBackend/IsActiveTests.cpp b/test/unittest/StatisticsBackend/IsActiveTests.cpp
@@ -36,7 +36,7 @@ class is_active_tests : public ::testing::Test
 
     void SetUp()
     {
-        db = new DataBaseTest;
+        db = new DataBaseTest;  // This will be deleted inside StatisticsBackendTest unset_database
         DatabaseDump dump;
         load_file(EMPTY_ENTITIES_DUMP_FILE, dump);
         db->load_database(dump);
@@ -106,6 +106,7 @@ class is_active_tests : public ::testing::Test
         delete entity_queue;
         delete data_queue;
         delete participant_listener;
+        StatisticsBackendTest::unset_database();
     }
 
     std::shared_ptr<Host> host;
@@ -121,13 +122,13 @@ class is_active_tests : public ::testing::Test
     DataBaseTest* db;
 
     // Entity queue, attached to the database
-    DatabaseEntityQueue* entity_queue;
+    DatabaseEntityQueue* entity_queue = nullptr;
     // Data queue, attached to the database
-    DatabaseDataQueue* data_queue;
+    DatabaseDataQueue* data_queue = nullptr;
     // Statistics participant_, that is supposed to receive the callbacks
     eprosima::fastdds::dds::DomainParticipant statistics_participant;
     // Listener under tests. Will receive a pointer to statistics_participant
-    StatisticsParticipantListener* participant_listener;
+    StatisticsParticipantListener* participant_listener = nullptr;
 };
 
 // Windows dll do not export ParticipantProxyData class members (private APIs)

diff --git a/test/unittest/TestUtils/DatabaseUtils.hpp b/test/unittest/TestUtils/DatabaseUtils.hpp
@@ -636,6 +636,10 @@ class StatisticsBackendTest : public StatisticsBackend
         }
     }
 
+    static void unset_database()
+    {
+        details::StatisticsBackendData::get_instance()->database_.reset();
+    }
 };
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -636,6 +636,10 @@ class StatisticsBackendTest : public StatisticsBackend @@
             }
         }
+        static void unset_database()
+        {
+            details::StatisticsBackendData::get_instance()->database_.reset();
+        }
     };
     /**
@@ Expand Down @@