diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/install.c | 16 | ||||
| -rw-r--r-- | src/shared/path-lookup.c | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 4e047157cc..478abac8ab 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1855,7 +1855,7 @@ int unit_file_unmask( _cleanup_lookup_paths_free_ LookupPaths paths = {}; _cleanup_set_free_free_ Set *remove_symlinks_to = NULL; - _cleanup_free_ char **todo = NULL; + _cleanup_strv_free_ char **todo = NULL; size_t n_todo = 0, n_allocated = 0; const char *config_path; char **i; @@ -1893,7 +1893,11 @@ int unit_file_unmask( if (!GREEDY_REALLOC0(todo, n_allocated, n_todo + 2)) return -ENOMEM; - todo[n_todo++] = *i; + todo[n_todo] = strdup(*i); + if (!todo[n_todo]) + return -ENOMEM; + + n_todo++; } strv_uniq(todo); @@ -1941,7 +1945,7 @@ int unit_file_link( unsigned *n_changes) { _cleanup_lookup_paths_free_ LookupPaths paths = {}; - _cleanup_free_ char **todo = NULL; + _cleanup_strv_free_ char **todo = NULL; size_t n_todo = 0, n_allocated = 0; const char *config_path; char **i; @@ -1990,7 +1994,11 @@ int unit_file_link( if (!GREEDY_REALLOC0(todo, n_allocated, n_todo + 2)) return -ENOMEM; - todo[n_todo++] = *i; + todo[n_todo] = strdup(*i); + if (!todo[n_todo]) + return -ENOMEM; + + n_todo++; } strv_uniq(todo); diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index a23d09967e..586ef64e72 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -139,7 +139,7 @@ static char** user_dirs( const char *e; _cleanup_strv_free_ char **config_dirs = NULL, **data_dirs = NULL; _cleanup_free_ char *data_home = NULL; - _cleanup_free_ char **res = NULL; + _cleanup_strv_free_ char **res = NULL; char **tmp; int r; |