Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set allocator before goto fail. #546

Merged
merged 1 commit into from
Dec 5, 2019
Merged

Set allocator before goto fail. #546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rcl/src/rcl/init.c
View file
Open in desktop
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