diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c index e4fe376..0025bdd 100644 --- a/rcl/src/rcl/init.c +++ b/rcl/src/rcl/init.c @@ -175,6 +175,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( @@ -195,12 +202,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(