niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the potential application crash issues (#426)

Browse source 
* err msg

* err msg

* Fix the potential application crash issues

Signed-off-by: Ethan Gao <ethan.gao@linux.intel.com>

* minor tweak the code structure

Signed-off-by: Ethan Gao <ethan.gao@linux.intel.com>
This commit is contained in:
Ethan Gao 2017-12-20 05:39:56 +08:00 • committed by Chris Lalancette
parent bea1a52e24
commit 199a26984d
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rclcpp/include/rclcpp/service.hpp
View file

@ -158,8 +158,13 @@ public:
std::string("rcl_service_t in constructor argument must be initialized beforehand.")); std::string("rcl_service_t in constructor argument must be initialized beforehand."));
// *INDENT-ON* // *INDENT-ON*
} }
const char * service_name = rcl_service_get_service_name(service_handle);
if (!service_name) {
throw std::runtime_error("failed to get service name");
}
service_handle_ = service_handle; service_handle_ = service_handle;
service_name_ = std::string(rcl_service_get_service_name(service_handle)); service_name_ = std::string(service_name);
owns_rcl_handle_ = false; owns_rcl_handle_ = false;
} }

8
rclcpp/src/rclcpp/publisher.cpp
View file

@ -170,7 +170,13 @@ PublisherBase::setup_intra_process(
StoreMessageCallbackT callback, StoreMessageCallbackT callback,
const rcl_publisher_options_t & intra_process_options) const rcl_publisher_options_t & intra_process_options)
{ {
auto intra_process_topic_name = std::string(this->get_topic_name()) + "/_intra"; const char * topic_name = this->get_topic_name();
if (!topic_name) {
throw std::runtime_error("failed to get topic name");
}
auto intra_process_topic_name = std::string(topic_name) + "/_intra";
rcl_ret_t ret = rcl_publisher_init( rcl_ret_t ret = rcl_publisher_init(
&intra_process_publisher_handle_, &intra_process_publisher_handle_,
rcl_node_handle_.get(), rcl_node_handle_.get(),