From 660b1b0ab29797aab9f10ce99b40ad500e2c3106 Mon Sep 17 00:00:00 2001
From: Yuyuan Yuan <az6980522@gmail.com>
Date: Fri, 10 Jan 2025 02:06:02 +0800
Subject: [PATCH] fix: check the context validity before accessing the session
 (#403)

---
 rmw_zenoh_cpp/src/rmw_zenoh.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
index 774ce720..eb0ec924 100644
--- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp
+++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -395,6 +395,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;
@@ -936,6 +940,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;
@@ -1439,6 +1447,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;
@@ -1701,6 +1713,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;