From 59dc29a3bf5a0ec0a2fd692d2ccece9b1bc757ff Mon Sep 17 00:00:00 2001 From: Jackie Kay Date: Tue, 25 Aug 2015 12:47:54 -0700 Subject: [PATCH] check intra-process subscription handle before derefencing --- rclcpp/include/rclcpp/executor.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rclcpp/include/rclcpp/executor.hpp b/rclcpp/include/rclcpp/executor.hpp index c58370c..08f717c 100644 --- a/rclcpp/include/rclcpp/executor.hpp +++ b/rclcpp/include/rclcpp/executor.hpp @@ -491,7 +491,9 @@ protected: if (subscription->subscription_handle_->data == subscriber_handle) { return subscription; } - if (subscription->intra_process_subscription_handle_->data == subscriber_handle) { + if (subscription->intra_process_subscription_handle_ && + subscription->intra_process_subscription_handle_->data == subscriber_handle) + { return subscription; } }