niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't overwrite cur_ns pointer if reallocation fails (#780) (#783)

Browse source 
Signed-off-by: Stephen Brawner <brawner@gmail.com>
This commit is contained in:
brawner 2020-10-01 16:25:16 -07:00 • committed by GitHub
parent 2e9ce913db
commit d22d923931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rcl_yaml_param_parser/src/parser.c
View file

@ -214,10 +214,11 @@ static rcutils_ret_t add_name_to_ns(
tot_len = ns_len + sep_len + name_len + 1U; tot_len = ns_len + sep_len + name_len + 1U;
cur_ns = allocator.reallocate(cur_ns, tot_len, allocator.state); char * tmp_ns_ptr = allocator.reallocate(cur_ns, tot_len, allocator.state);
if (NULL == cur_ns) { if (NULL == tmp_ns_ptr) {
return RCUTILS_RET_BAD_ALLOC; return RCUTILS_RET_BAD_ALLOC;
} }
cur_ns = tmp_ns_ptr;
memmove((cur_ns + ns_len), sep_str, sep_len); memmove((cur_ns + ns_len), sep_str, sep_len);
memmove((cur_ns + ns_len + sep_len), name, name_len); memmove((cur_ns + ns_len + sep_len), name, name_len);
cur_ns[tot_len - 1U] = '\0'; cur_ns[tot_len - 1U] = '\0';
@ -284,10 +285,11 @@ static rcutils_ret_t rem_name_from_ns(
} }
if (NULL != last_idx) { if (NULL != last_idx) {
tot_len = ((size_t)(last_idx - cur_ns) + 1U); tot_len = ((size_t)(last_idx - cur_ns) + 1U);
cur_ns = allocator.reallocate(cur_ns, tot_len, allocator.state); char * tmp_ns_ptr = allocator.reallocate(cur_ns, tot_len, allocator.state);
if (NULL == cur_ns) { if (NULL == tmp_ns_ptr) {
return RCUTILS_RET_BAD_ALLOC; return RCUTILS_RET_BAD_ALLOC;
} }
cur_ns = tmp_ns_ptr;
cur_ns[tot_len - 1U] = '\0'; cur_ns[tot_len - 1U] = '\0';
} }
} }