36 lines
998 B
Diff
36 lines
998 B
Diff
|
From e63ff941eaa012ffd003e3791438c73b8a26227d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tom Gundersen <teg@jklm.no>
|
||
|
|
Date: Tue, 30 Sep 2014 11:34:01 +0200
|
||
|
|
Subject: [PATCH] core: execute - don't leak strv
|
||
|
|
|
||
|
|
---
|
||
|
|
src/core/execute.c | 6 ++----
|
||
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/execute.c b/src/core/execute.c
|
||
|
|
index 07ec7a28d6..8b9bb27137 100644
|
||
|
|
--- a/src/core/execute.c
|
||
|
|
+++ b/src/core/execute.c
|
||
|
|
@@ -2567,8 +2567,8 @@ int exec_command_set(ExecCommand *c, const char *path, ...) {
|
||
|
|
}
|
||
|
|
|
||
|
|
int exec_command_append(ExecCommand *c, const char *path, ...) {
|
||
|
|
+ _cleanup_strv_free_ char **l = NULL;
|
||
|
|
va_list ap;
|
||
|
|
- char **l;
|
||
|
|
int r;
|
||
|
|
|
||
|
|
assert(c);
|
||
|
|
@@ -2582,10 +2582,8 @@ int exec_command_append(ExecCommand *c, const char *path, ...) {
|
||
|
|
return -ENOMEM;
|
||
|
|
|
||
|
|
r = strv_extend_strv(&c->argv, l);
|
||
|
|
- if (r < 0) {
|
||
|
|
- strv_free(l);
|
||
|
|
+ if (r < 0)
|
||
|
|
return r;
|
||
|
|
- }
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|