proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 21:26:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3864 from lifeng68/master

Browse Source 
string utils: Make sure don't return uninitialized memory.
This commit is contained in:
Christian Brauner 2021-06-14 11:34:14 +02:00 committed by GitHub
commit 51bbca901b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/string_utils.c
View File

@ -404,6 +404,9 @@ char **lxc_string_split_quoted(char *string)
if (state == 'a') if (state == 'a')
complete_word(&result, nextword, p, &result_capacity, &result_count); complete_word(&result, nextword, p, &result_capacity, &result_count);
if (result == NULL)
return calloc(1, sizeof(char *));
return realloc(result, (result_count + 1) * sizeof(char *)); return realloc(result, (result_count + 1) * sizeof(char *));
} }
@ -443,6 +446,9 @@ char **lxc_string_split_and_trim(const char *string, char _sep)
result_count++; result_count++;
} }
if (result == NULL)
return calloc(1, sizeof(char *));
/* if we allocated too much, reduce it */ /* if we allocated too much, reduce it */
return realloc(result, (result_count + 1) * sizeof(char *)); return realloc(result, (result_count + 1) * sizeof(char *));