|
 |
9fc0f6 |
From 0ec33b41e2fddd714851b444d85c4bd8a4fae879 Mon Sep 17 00:00:00 2001
|
|
|
9fc0f6 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
9fc0f6 |
Date: Thu, 30 Jan 2014 21:40:27 -0500
|
|
|
9fc0f6 |
Subject: [PATCH] tmpfiles: fix memory leak of exclude_prefixes
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
Missed in 5c795114.
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
(cherry picked from commit 498f8a39e66a62d015ac78e67e2504658bbba5f2)
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
Related: #1111199
|
|
|
9fc0f6 |
---
|
|
|
9fc0f6 |
src/tmpfiles/tmpfiles.c | 7 ++++---
|
|
|
9fc0f6 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
|
|
9fc0f6 |
index 32f9088..1337d02 100644
|
|
|
9fc0f6 |
--- a/src/tmpfiles/tmpfiles.c
|
|
|
9fc0f6 |
+++ b/src/tmpfiles/tmpfiles.c
|
|
|
9fc0f6 |
@@ -1332,12 +1332,12 @@ static int parse_argv(int argc, char *argv[]) {
|
|
|
9fc0f6 |
break;
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
case ARG_PREFIX:
|
|
|
9fc0f6 |
- if (strv_extend(&include_prefixes, optarg) < 0)
|
|
|
9fc0f6 |
+ if (strv_push(&include_prefixes, optarg) < 0)
|
|
|
9fc0f6 |
return log_oom();
|
|
|
9fc0f6 |
break;
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
case ARG_EXCLUDE_PREFIX:
|
|
|
9fc0f6 |
- if (strv_extend(&exclude_prefixes, optarg) < 0)
|
|
|
9fc0f6 |
+ if (strv_push(&exclude_prefixes, optarg) < 0)
|
|
|
9fc0f6 |
return log_oom();
|
|
|
9fc0f6 |
break;
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
@@ -1498,7 +1498,8 @@ finish:
|
|
|
9fc0f6 |
hashmap_free(items);
|
|
|
9fc0f6 |
hashmap_free(globs);
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
- strv_free(include_prefixes);
|
|
|
9fc0f6 |
+ free(include_prefixes);
|
|
|
9fc0f6 |
+ free(exclude_prefixes);
|
|
|
9fc0f6 |
|
|
|
9fc0f6 |
set_free_free(unix_sockets);
|
|
|
9fc0f6 |
|