From 722bcc512fa380304a4d2f3cc7434b57648dadb5 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 19 Jun 2024 10:21:11 +0200 Subject: [PATCH] Refs #21082. Fix release order in `WriterHistory` destructor. Signed-off-by: Miguel Company --- src/cpp/rtps/history/WriterHistory.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cpp/rtps/history/WriterHistory.cpp b/src/cpp/rtps/history/WriterHistory.cpp index 74ccdcf1682..66c0ae35473 100644 --- a/src/cpp/rtps/history/WriterHistory.cpp +++ b/src/cpp/rtps/history/WriterHistory.cpp @@ -114,7 +114,11 @@ WriterHistory::WriterHistory( WriterHistory::~WriterHistory() { - // TODO Auto-generated destructor stub + // As releasing the change pool will delete the cache changes it owns, + // the payload pool may be called to release their payloads, so we should + // ensure that the payload pool is destroyed after the change pool. + change_pool_.reset(); + payload_pool_.reset(); } const std::shared_ptr& WriterHistory::get_payload_pool() const