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

Set allocator before goto fail (#546)

Browse source 
Signed-off-by: Borja Outerelo <borjaouterelo@gmail.com>
This commit is contained in:
Jacob Perron 2019-12-05 13:30:32 -08:00 • committed by GitHub
parent 3a5c3a3419
commit 73d2c4caec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,6 +83,9 @@ rcl_init(
// Zero initialize rmw context first so its validity can by checked in cleanup. // Zero initialize rmw context first so its validity can by checked in cleanup.
context->impl->rmw_context = rmw_get_zero_initialized_context(); context->impl->rmw_context = rmw_get_zero_initialized_context();
// Store the allocator.
context->impl->allocator = allocator;
// Copy the options into the context for future reference. // Copy the options into the context for future reference.
rcl_ret_t ret = rcl_init_options_copy(options, &(context->impl->init_options)); rcl_ret_t ret = rcl_init_options_copy(options, &(context->impl->init_options));
if (RCL_RET_OK != ret) { if (RCL_RET_OK != ret) {
@ -151,9 +154,6 @@ rcl_init(
goto fail; goto fail;
} }
// Store the allocator.
context->impl->allocator = allocator;
TRACEPOINT(rcl_init, (const void *)context); TRACEPOINT(rcl_init, (const void *)context);
return RCL_RET_OK; return RCL_RET_OK;