Skip to content

[foxy] Fix memory leak in rcl_subscription_init()/rcl_publisher_init() (#794) #832

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

Merged
merged 3 commits into from
Oct 16, 2020
Merged

[foxy] Fix memory leak in rcl_subscription_init()/rcl_publisher_init() (#794) #832

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16f4411
Fix memory leak in rcl_subscription_init()/rcl_publisher_init() (#794)
Barry-Xu-2018 Oct 14, 2020
4bf6989
Remove format string
jacobperron Oct 16, 2020
62db41b
Print new line
jacobperron Oct 16, 2020
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
8 changes: 8 additions & 0 deletions rcl/src/rcl/publisher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,14 @@ rcl_publisher_init(
goto cleanup;
fail:
if (publisher->impl) {
if (publisher->impl->rmw_handle) {
rmw_ret_t rmw_fail_ret = rmw_destroy_publisher(
rcl_node_get_rmw_handle(node), publisher->impl->rmw_handle);
if (RMW_RET_OK != rmw_fail_ret) {
RCUTILS_SAFE_FWRITE_TO_STDERR(rmw_get_error_string().str);
}
}

allocator->deallocate(publisher->impl, allocator->state);
publisher->impl = NULL;
}
Expand Down
8 changes: 8 additions & 0 deletions rcl/src/rcl/subscription.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,14 @@ rcl_subscription_init(
goto cleanup;
fail:
if (subscription->impl) {
if (subscription->impl->rmw_handle) {
rmw_ret_t rmw_fail_ret = rmw_destroy_subscription(
rcl_node_get_rmw_handle(node), subscription->impl->rmw_handle);
if (RMW_RET_OK != rmw_fail_ret) {
RCUTILS_SAFE_FWRITE_TO_STDERR(rmw_get_error_string().str);
}
}

allocator->deallocate(subscription->impl, allocator->state);
}
ret = fail_ret;
Expand Down