fix: check the context validity before accessing the session (#403) (#…

…406) (cherry picked from commit 660b1b0) Co-authored-by: Yuyuan Yuan <az6980522@gmail.com>
ros2 · Jan 10, 2025 · 0e7dcba · 0e7dcba
1 parent c0e9319
commit 0e7dcba
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -393,6 +393,10 @@ rmw_create_publisher(
     context_impl,
     "unable to get rmw_context_impl_s",
     return nullptr);
+  if (context_impl->is_shutdown()) {
+    RMW_SET_ERROR_MSG("context_impl is shutdown");
+    return nullptr;
+  }
   if (!context_impl->session_is_valid()) {
     RMW_SET_ERROR_MSG("zenoh session is invalid");
     return nullptr;
@@ -926,6 +930,10 @@ rmw_create_subscription(
     context_impl,
     "unable to get rmw_context_impl_s",
     return nullptr);
+  if (context_impl->is_shutdown()) {
+    RMW_SET_ERROR_MSG("context_impl is shutdown");
+    return nullptr;
+  }
   if (!context_impl->session_is_valid()) {
     RMW_SET_ERROR_MSG("zenoh session is invalid");
     return nullptr;
@@ -1398,6 +1406,10 @@ rmw_create_client(
     context_impl,
     "unable to get rmw_context_impl_s",
     return nullptr);
+  if (context_impl->is_shutdown()) {
+    RMW_SET_ERROR_MSG("context_impl is shutdown");
+    return nullptr;
+  }
   if (!context_impl->session_is_valid()) {
     RMW_SET_ERROR_MSG("zenoh session is invalid");
     return nullptr;
@@ -1646,6 +1658,10 @@ rmw_create_service(
     context_impl,
     "unable to get rmw_context_impl_s",
     return nullptr);
+  if (context_impl->is_shutdown()) {
+    RMW_SET_ERROR_MSG("context_impl is shutdown");
+    return nullptr;
+  }
   if (!context_impl->session_is_valid()) {
     RMW_SET_ERROR_MSG("zenoh session is invalid");
     return nullptr;