Add safety check

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
eProsima · Feb 2, 2024 · 79f136f · 79f136f
1 parent f7f1390
commit 79f136f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/src/cpp/fastdds/publisher/PublisherImpl.cpp b/src/cpp/fastdds/publisher/PublisherImpl.cpp
@@ -245,22 +245,25 @@ DataWriter* PublisherImpl::create_datawriter(
     }
 
     // Check netmask filtering preconditions
-    fastrtps::rtps::RTPSParticipantImpl* rtps_impl = fastrtps::rtps::RTPSDomainImpl::find_local_participant(
-        rtps_participant()->getGuid());
-    if (nullptr != rtps_impl)
-    {
-        std::vector<fastdds::rtps::NetmaskFilterUtils::TransportNetmaskFilterInfo> netmask_filter_info =
-                rtps_impl->network_factory().netmask_filter_info();
-        std::string error_msg;
-        if (!fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
-                qos.endpoint().ignore_non_matching_locators,
-                error_msg) ||
-                !fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
-                qos.endpoint().external_unicast_locators, error_msg))
+    if (nullptr != rtps_participant())
+    {
+        fastrtps::rtps::RTPSParticipantImpl* rtps_impl = fastrtps::rtps::RTPSDomainImpl::find_local_participant(
+            rtps_participant()->getGuid());
+        if (nullptr != rtps_impl)
         {
-            EPROSIMA_LOG_ERROR(PUBLISHER,
-                    "Failed to create publisher -> " << error_msg);
-            return nullptr;
+            std::vector<fastdds::rtps::NetmaskFilterUtils::TransportNetmaskFilterInfo> netmask_filter_info =
+                    rtps_impl->network_factory().netmask_filter_info();
+            std::string error_msg;
+            if (!fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
+                    qos.endpoint().ignore_non_matching_locators,
+                    error_msg) ||
+                    !fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
+                    qos.endpoint().external_unicast_locators, error_msg))
+            {
+                EPROSIMA_LOG_ERROR(PUBLISHER,
+                        "Failed to create publisher -> " << error_msg);
+                return nullptr;
+            }
         }
     }
 

diff --git a/src/cpp/fastdds/subscriber/SubscriberImpl.cpp b/src/cpp/fastdds/subscriber/SubscriberImpl.cpp
@@ -214,22 +214,25 @@ DataReader* SubscriberImpl::create_datareader(
     }
 
     // Check netmask filtering preconditions
-    fastrtps::rtps::RTPSParticipantImpl* rtps_impl = fastrtps::rtps::RTPSDomainImpl::find_local_participant(
-        rtps_participant()->getGuid());
-    if (nullptr != rtps_impl)
-    {
-        std::vector<fastdds::rtps::NetmaskFilterUtils::TransportNetmaskFilterInfo> netmask_filter_info =
-                rtps_impl->network_factory().netmask_filter_info();
-        std::string error_msg;
-        if (!fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
-                qos.endpoint().ignore_non_matching_locators,
-                error_msg) ||
-                !fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
-                qos.endpoint().external_unicast_locators, error_msg))
+    if (nullptr != rtps_participant())
+    {
+        fastrtps::rtps::RTPSParticipantImpl* rtps_impl = fastrtps::rtps::RTPSDomainImpl::find_local_participant(
+            rtps_participant()->getGuid());
+        if (nullptr != rtps_impl)
         {
-            EPROSIMA_LOG_ERROR(SUBSCRIBER,
-                    "Failed to create subscriber -> " << error_msg);
-            return nullptr;
+            std::vector<fastdds::rtps::NetmaskFilterUtils::TransportNetmaskFilterInfo> netmask_filter_info =
+                    rtps_impl->network_factory().netmask_filter_info();
+            std::string error_msg;
+            if (!fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
+                    qos.endpoint().ignore_non_matching_locators,
+                    error_msg) ||
+                    !fastdds::rtps::NetmaskFilterUtils::check_preconditions(netmask_filter_info,
+                    qos.endpoint().external_unicast_locators, error_msg))
+            {
+                EPROSIMA_LOG_ERROR(SUBSCRIBER,
+                        "Failed to create subscriber -> " << error_msg);
+                return nullptr;
+            }
         }
     }