Disable DataReader on destruction (#2313)

* Refs #12870: Disable datareader on destruction Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com> * Refs #12870: Protect RTPSReader::setListener Signed-off-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com> (cherry picked from commit d4de4a1)
eProsima · Nov 12, 2021 · 698b296 · 698b296
1 parent ad09169
commit 698b296
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
@@ -285,6 +285,8 @@ void DataReaderImpl::disable()
 
 DataReaderImpl::~DataReaderImpl()
 {
+    // Disable the datareader to prevent receiving data in the middle of deleting it
+    disable();
     delete lifespan_timer_;
     delete deadline_timer_;
 

diff --git a/src/cpp/fastdds/subscriber/SubscriberImpl.cpp b/src/cpp/fastdds/subscriber/SubscriberImpl.cpp
@@ -314,7 +314,6 @@ ReturnCode_t SubscriberImpl::delete_datareader(
                 return ReturnCode_t::RETCODE_PRECONDITION_NOT_MET;
             }
 
-            reader_impl->set_listener(nullptr);
             it->second.erase(dr_it);
             if (it->second.empty())
             {

diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp
@@ -208,6 +208,7 @@ ReaderListener* RTPSReader::getListener() const
 bool RTPSReader::setListener(
         ReaderListener* target)
 {
+    std::lock_guard<RecursiveTimedMutex> guard(mp_mutex);
     mp_listener = target;
     return true;
 }