Skip to content

[foxy backport] Set yaml_variant values to NULL on finalization (#765) #782

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 1 commit into from
Oct 1, 2020
Merged

[foxy backport] Set yaml_variant values to NULL on finalization (#765) #782

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
8 changes: 8 additions & 0 deletions rcl_yaml_param_parser/src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,33 +593,41 @@ void rcl_yaml_variant_fini(

if (NULL != param_var->bool_value) {
allocator.deallocate(param_var->bool_value, allocator.state);
param_var->bool_value = NULL;
} else if (NULL != param_var->integer_value) {
allocator.deallocate(param_var->integer_value, allocator.state);
param_var->integer_value = NULL;
} else if (NULL != param_var->double_value) {
allocator.deallocate(param_var->double_value, allocator.state);
param_var->double_value = NULL;
} else if (NULL != param_var->string_value) {
allocator.deallocate(param_var->string_value, allocator.state);
param_var->string_value = NULL;
} else if (NULL != param_var->bool_array_value) {
if (NULL != param_var->bool_array_value->values) {
allocator.deallocate(param_var->bool_array_value->values, allocator.state);
}
allocator.deallocate(param_var->bool_array_value, allocator.state);
param_var->bool_array_value = NULL;
} else if (NULL != param_var->integer_array_value) {
if (NULL != param_var->integer_array_value->values) {
allocator.deallocate(param_var->integer_array_value->values, allocator.state);
}
allocator.deallocate(param_var->integer_array_value, allocator.state);
param_var->integer_array_value = NULL;
} else if (NULL != param_var->double_array_value) {
if (NULL != param_var->double_array_value->values) {
allocator.deallocate(param_var->double_array_value->values, allocator.state);
}
allocator.deallocate(param_var->double_array_value, allocator.state);
param_var->double_array_value = NULL;
} else if (NULL != param_var->string_array_value) {
if (RCUTILS_RET_OK != rcutils_string_array_fini(param_var->string_array_value)) {
// Log and continue ...
RCUTILS_SAFE_FWRITE_TO_STDERR("Error deallocating string array");
}
allocator.deallocate(param_var->string_array_value, allocator.state);
param_var->string_array_value = NULL;
} else {
/// Nothing to do to keep pclint happy
}
Expand Down