daandemeyer / rpms / systemd

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