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

string_utils: remove stack allocations

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2019-02-05 07:30:00 +01:00
parent 643c9ec994
commit 97f35ce6f8
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lxc/string_utils.c
View File

@ -46,6 +46,7 @@
#include "config.h" #include "config.h"
#include "lxclock.h" #include "lxclock.h"
#include "macro.h" #include "macro.h"
#include "memory_utils.h"
#include "namespace.h" #include "namespace.h"
#include "parse.h" #include "parse.h"
#include "string_utils.h" #include "string_utils.h"
@ -321,17 +322,14 @@ char *lxc_append_paths(const char *first, const char *second)
bool lxc_string_in_list(const char *needle, const char *haystack, char _sep) bool lxc_string_in_list(const char *needle, const char *haystack, char _sep)
{ {
char *token, *str; __do_free char *str = NULL;
char *token;
char sep[2] = { _sep, '\0' }; char sep[2] = { _sep, '\0' };
size_t len;
if (!haystack || !needle) if (!haystack || !needle)
return 0; return 0;
len = strlen(haystack); str = must_copy_string(haystack);
str = alloca(len + 1);
(void)strlcpy(str, haystack, len + 1);
lxc_iterate_parts(token, str, sep) lxc_iterate_parts(token, str, sep)
if (strcmp(needle, token) == 0) if (strcmp(needle, token) == 0)
return 1; return 1;
@ -341,21 +339,18 @@ bool lxc_string_in_list(const char *needle, const char *haystack, char _sep)
char **lxc_string_split(const char *string, char _sep) char **lxc_string_split(const char *string, char _sep)
{ {
char *token, *str; __do_free char *str = NULL;
char *token;
char sep[2] = {_sep, '\0'}; char sep[2] = {_sep, '\0'};
char **tmp = NULL, **result = NULL; char **tmp = NULL, **result = NULL;
size_t result_capacity = 0; size_t result_capacity = 0;
size_t result_count = 0; size_t result_count = 0;
int r, saved_errno; int r, saved_errno;
size_t len;
if (!string) if (!string)
return calloc(1, sizeof(char *)); return calloc(1, sizeof(char *));
len = strlen(string); str = must_copy_string(string);
str = alloca(len + 1);
(void)strlcpy(str, string, len + 1);
lxc_iterate_parts(token, str, sep) { lxc_iterate_parts(token, str, sep) {
r = lxc_grow_array((void ***)&result, &result_capacity, result_count + 1, 16); r = lxc_grow_array((void ***)&result, &result_capacity, result_count + 1, 16);
if (r < 0) if (r < 0)
@ -461,22 +456,19 @@ char **lxc_string_split_quoted(char *string)
char **lxc_string_split_and_trim(const char *string, char _sep) char **lxc_string_split_and_trim(const char *string, char _sep)
{ {
char *token, *str; __do_free char *str = NULL;
char *token;
char sep[2] = { _sep, '\0' }; char sep[2] = { _sep, '\0' };
char **result = NULL; char **result = NULL;
size_t result_capacity = 0; size_t result_capacity = 0;
size_t result_count = 0; size_t result_count = 0;
int r, saved_errno; int r, saved_errno;
size_t i = 0; size_t i = 0;
size_t len;
if (!string) if (!string)
return calloc(1, sizeof(char *)); return calloc(1, sizeof(char *));
len = strlen(string); str = must_copy_string(string);
str = alloca(len + 1);
(void)strlcpy(str, string, len + 1);
lxc_iterate_parts(token, str, sep) { lxc_iterate_parts(token, str, sep) {
while (token[0] == ' ' || token[0] == '\t') while (token[0] == ' ' || token[0] == '\t')
token++; token++;