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

Fix memory leaks

Browse source 
Also remove superfluous include and blank line.

Signed-off-by: Sid Faber <sid.faber@canonical.com>
This commit is contained in:
Sid Faber 2020-03-27 11:54:55 -04:00 • committed by GitHub
parent bca0852f50
commit 5e934200ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rmw_cyclonedds_cpp/src/rmw_node.cpp
View file

@ -61,7 +61,6 @@
#include "namespace_prefix.hpp" #include "namespace_prefix.hpp"
#include "dds/dds.h" #include "dds/dds.h"
#include "dds/ddsc/dds_public_qos.h"
#include "dds/ddsi/ddsi_sertopic.h" #include "dds/ddsi/ddsi_sertopic.h"
#include "rmw_cyclonedds_cpp/serdes.hpp" #include "rmw_cyclonedds_cpp/serdes.hpp"
#include "serdata.hpp" #include "serdata.hpp"
@ -695,7 +694,6 @@ void store_security_filepath_in_qos(
rmw_ret_t configure_qos_for_security( rmw_ret_t configure_qos_for_security(
dds_qos_t * qos, const rmw_node_security_options_t * security_options) dds_qos_t * qos, const rmw_node_security_options_t * security_options)
{ {
#if RMW_SUPPORT_SECURITY #if RMW_SUPPORT_SECURITY
/* File path is set to nullptr if file does not exist or is not readable */ /* File path is set to nullptr if file does not exist or is not readable */
store_security_filepath_in_qos( store_security_filepath_in_qos(
@ -789,13 +787,18 @@ extern "C" rmw_node_t * rmw_create_node(
#endif #endif
dds_qos_t * qos = dds_create_qos(); dds_qos_t * qos = dds_create_qos();
RCUTILS_CHECK_FOR_NULL_WITH_MSG( if (qos == nullptr) {
security_options, "rmw_create_node: Unable to create qos", return nullptr); RCUTILS_LOG_ERROR_NAMED("rmw_cyclonedds_cpp", "rmw_create_node: Unable to create qos");
node_gone_from_domain_locked(did);
return nullptr;
}
std::string user_data = get_node_user_data(name, namespace_); std::string user_data = get_node_user_data(name, namespace_);
dds_qset_userdata(qos, user_data.c_str(), user_data.size()); dds_qset_userdata(qos, user_data.c_str(), user_data.size());
if (security_options->enforce_security) { if (security_options->enforce_security) {
if (configure_qos_for_security(qos, security_options) != RMW_RET_OK) { if (configure_qos_for_security(qos, security_options) != RMW_RET_OK) {
dds_delete_qos(qos);
node_gone_from_domain_locked(did);
return nullptr; return nullptr;
} }
} }