Set rmw_dds_common::GraphCache callback after init succeeds. (#496)

Otherwise, during stack unwinding, the graph cache may end up with a callback that captures and uses an already destroyed guard condition. Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
ros2 · Dec 16, 2020 · 975861a · 975861a
1 parent c3b958e
commit 975861a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/rmw_fastrtps_cpp/src/init_rmw_context_impl.cpp b/rmw_fastrtps_cpp/src/init_rmw_context_impl.cpp
@@ -151,13 +151,6 @@ init_context_impl(rmw_context_t * context)
     return RMW_RET_BAD_ALLOC;
   }
 
-  common_context->graph_cache.set_on_change_callback(
-    [guard_condition = graph_guard_condition.get()]() {
-      rmw_fastrtps_shared_cpp::__rmw_trigger_guard_condition(
-        eprosima_fastrtps_identifier,
-        guard_condition);
-    });
-
   common_context->gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
     eprosima_fastrtps_identifier, participant_info->participant->getGuid());
   common_context->pub = publisher.get();
@@ -171,6 +164,14 @@ init_context_impl(rmw_context_t * context)
   if (RMW_RET_OK != ret) {
     return ret;
   }
+
+  common_context->graph_cache.set_on_change_callback(
+    [guard_condition = graph_guard_condition.get()]() {
+      rmw_fastrtps_shared_cpp::__rmw_trigger_guard_condition(
+        eprosima_fastrtps_identifier,
+        guard_condition);
+    });
+
   common_context->graph_cache.add_participant(
     common_context->gid,
     context->options.enclave);

diff --git a/rmw_fastrtps_dynamic_cpp/src/init_rmw_context_impl.cpp b/rmw_fastrtps_dynamic_cpp/src/init_rmw_context_impl.cpp
@@ -151,14 +151,6 @@ init_context_impl(rmw_context_t * context)
     return RMW_RET_BAD_ALLOC;
   }
 
-  common_context->graph_cache.set_on_change_callback(
-    [guard_condition = graph_guard_condition.get()]() {
-      rmw_fastrtps_shared_cpp::__rmw_trigger_guard_condition(
-        eprosima_fastrtps_identifier,
-        guard_condition);
-    });
-
-
   common_context->gid = rmw_fastrtps_shared_cpp::create_rmw_gid(
     eprosima_fastrtps_identifier, participant_info->participant->getGuid());
   common_context->pub = publisher.get();
@@ -172,6 +164,14 @@ init_context_impl(rmw_context_t * context)
   if (RMW_RET_OK != ret) {
     return ret;
   }
+
+  common_context->graph_cache.set_on_change_callback(
+    [guard_condition = graph_guard_condition.get()]() {
+      rmw_fastrtps_shared_cpp::__rmw_trigger_guard_condition(
+        eprosima_fastrtps_identifier,
+        guard_condition);
+    });
+
   common_context->graph_cache.add_participant(
     common_context->gid,
     context->options.enclave);