From 6dec14df98688912a10a053b62e901855cf93e4c Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Wed, 26 Aug 2020 15:24:46 -0300 Subject: [PATCH] Check rcutils_strdup() outcome immediately. Within rcl_node_init() implementation. Signed-off-by: Michel Hidalgo --- rcl/src/rcl/init.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c index b3065f27e..d8f7dd44a 100644 --- a/rcl/src/rcl/init.c +++ b/rcl/src/rcl/init.c @@ -172,6 +172,13 @@ rcl_init( context->impl->init_options.impl->rmw_init_options.enclave = rcutils_strdup( "/", 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; size_t invalid_index; ret = rcl_validate_enclave_name( @@ -192,12 +199,6 @@ rcl_init( 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 = &context->impl->init_options.impl->rmw_init_options.security_options; ret = rcl_get_security_options_from_environment(