Skip to content

Commit

Permalink
Set allocator before goto fail (ros2#546)
Browse files Browse the repository at this point in the history
Signed-off-by: Borja Outerelo <borjaouterelo@gmail.com>
  • Loading branch information
jacobperron authored and ralph-lange committed Dec 10, 2019
1 parent 92b9f79 commit 36918ef
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rcl/src/rcl/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ rcl_init(
// Zero initialize rmw context first so its validity can by checked in cleanup.
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.
rcl_ret_t ret = rcl_init_options_copy(options, &(context->impl->init_options));
if (RCL_RET_OK != ret) {
Expand Down Expand Up @@ -151,9 +154,6 @@ rcl_init(
goto fail;
}

// Store the allocator.
context->impl->allocator = allocator;

TRACEPOINT(rcl_init, (const void *)context);

return RCL_RET_OK;
Expand Down

0 comments on commit 36918ef

Please sign in to comment.