diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-24 22:24:07 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-24 22:26:10 -0500 |
| commit | 06ec51d8ef30dce3c7f864633ba3a9888d18fed6 (patch) | |
| tree | d06dee68003fd57c2a163b8797f9d1befb907e2c /src | |
| parent | f0c03de85afa93d1df2bb533a46748e7f4264af6 (diff) | |
core/execute: fix strv memleak
compile_read_write_paths() returns a normal strv from strv_copy(), and
setup_namespace() uses it read-only, so we should use strv_free to deallocate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/execute.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 06a291fd39..d0faba5a85 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1896,8 +1896,8 @@ static int compile_read_write_paths( _cleanup_strv_free_ char **l = NULL; char **rt; - /* Compile the list of writable paths. This is the combination of the explicitly configured paths, plus all - * runtime directories. */ + /* Compile the list of writable paths. This is the combination of + * the explicitly configured paths, plus all runtime directories. */ if (strv_isempty(context->read_write_paths) && strv_isempty(context->runtime_directory)) { @@ -1930,7 +1930,7 @@ static int apply_mount_namespace(Unit *u, const ExecContext *context, const ExecParameters *params, ExecRuntime *runtime) { int r; - _cleanup_free_ char **rw = NULL; + _cleanup_strv_free_ char **rw = NULL; char *tmp = NULL, *var = NULL; const char *root_dir = NULL; NameSpaceInfo ns_info = { |