shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

core: fix stack-use-after-scope

Browse Source 
Fixes a bug introduced by f70e6fb471a4eeed8e2a4a7c608beabbb0aba8be.

Fixes #18753.
This commit is contained in:
Yu Watanabe 2021-02-23 20:48:51 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent aa50464a7f
commit e94a009c10
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/main.c
View File

@ -700,26 +700,24 @@ static int parse_config_file(void) {
{}
};
_cleanup_strv_free_ char **_free_files = NULL, **_free_dirs = NULL;
const char *const *files, *const *dirs, *suffix;
_cleanup_strv_free_ char **files = NULL, **dirs = NULL;
const char *suffix;
int r;
if (arg_system) {
files = STRV_MAKE_CONST(PKGSYSCONFDIR "/system.conf");
dirs = (const char* const*) CONF_PATHS_STRV("systemd");
if (arg_system)
suffix = "system.conf.d";
} else {
r = manager_find_user_config_paths(&_free_files, &_free_dirs);
else {
r = manager_find_user_config_paths(&files, &dirs);
if (r < 0)
return log_error_errno(r, "Failed to determine config file paths: %m");
files = (const char* const*) _free_files;
dirs = (const char* const*) _free_dirs;
suffix = "user.conf.d";
}
(void) config_parse_many(
files, dirs, suffix,
(const char* const*) (files ?: STRV_MAKE(PKGSYSCONFDIR "/system.conf")),
(const char* const*) (dirs ?: CONF_PATHS_STRV("systemd")),
suffix,
"Manager\0",
config_item_table_lookup, items,
CONFIG_PARSE_WARN,