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

Check rcutils_strdup() outcome immediately. (#768)

Browse source 
Within rcl_node_init() implementation.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
This commit is contained in:
Michel Hidalgo 2020-08-28 09:54:48 -03:00 • committed by Alejandro Hernández Cordero
parent 9be4fe9e43
commit 14ef8e02f8
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rcl/src/rcl/init.c
View file

@ -175,6 +175,13 @@ rcl_init(
context->impl->init_options.impl->rmw_init_options.enclave = rcutils_strdup( context->impl->init_options.impl->rmw_init_options.enclave = rcutils_strdup(
"/", context->impl->allocator); "/", context->impl->allocator);
} }
if (!context->impl->init_options.impl->rmw_init_options.enclave) {
RCL_SET_ERROR_MSG("failed to set context name");
fail_ret = RCL_RET_BAD_ALLOC;
goto fail;
}
int validation_result; int validation_result;
size_t invalid_index; size_t invalid_index;
ret = rcl_validate_enclave_name( ret = rcl_validate_enclave_name(
@ -195,12 +202,6 @@ rcl_init(
goto fail; goto fail;
} }
if (!context->impl->init_options.impl->rmw_init_options.enclave) {
RCL_SET_ERROR_MSG("failed to set context name");
fail_ret = RCL_RET_BAD_ALLOC;
goto fail;
}
rmw_security_options_t * security_options = rmw_security_options_t * security_options =
&context->impl->init_options.impl->rmw_init_options.security_options; &context->impl->init_options.impl->rmw_init_options.security_options;
ret = rcl_get_security_options_from_environment( ret = rcl_get_security_options_from_environment(