Skip to content

Don't overwrite string data pointer if realloc fails #775

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
Aug 31, 2020
Merged

Don't overwrite string data pointer if realloc fails #775

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
5 changes: 3 additions & 2 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 @@ -998,13 +998,14 @@ static rcutils_ret_t add_val_to_string_arr(
val_array->data[0U] = value;
} else {
/// Increase the array size by one and add the new value
val_array->data = allocator.reallocate(
char ** new_string_arr_ptr = allocator.reallocate(
val_array->data,
((val_array->size + 1U) * sizeof(char *)), allocator.state);
if (NULL == val_array->data) {
if (NULL == new_string_arr_ptr) {
RCUTILS_SAFE_FWRITE_TO_STDERR("Error allocating mem\n");
return RCUTILS_RET_BAD_ALLOC;
}
val_array->data = new_string_arr_ptr;
val_array->data[val_array->size] = value;
val_array->size++;
}
Expand Down