daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1abbee
From c7d030b3f2b5969751872673e9082d0c10c031b5 Mon Sep 17 00:00:00 2001
1abbee
From: Evgeny Vereshchagin <evvers@ya.ru>
1abbee
Date: Fri, 15 Jan 2016 02:41:27 +0000
1abbee
Subject: [PATCH] core: fix memory leak in transient units
1abbee
1abbee
Fixes:
1abbee
==1== HEAP SUMMARY:
1abbee
==1==     in use at exit: 67,182 bytes in 91 blocks
1abbee
==1==   total heap usage: 70,485 allocs, 70,394 frees, 42,184,635 bytes
1abbee
allocated
1abbee
==1==
1abbee
==1== 5,742 (696 direct, 5,046 indirect) bytes in 29 blocks are
1abbee
definitely lost in loss record 4 of 7
1abbee
==1==    at 0x4C2DD9F: realloc (in
1abbee
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
1abbee
==1==    by 0x21ADDD: realloc_multiply (alloc-util.h:67)
1abbee
==1==    by 0x21BFB0: strv_push (strv.c:448)
1abbee
==1==    by 0x21C245: strv_consume (strv.c:520)
1abbee
==1==    by 0x21C33C: strv_extend (strv.c:559)
1abbee
==1==    by 0x278AD7: unit_write_drop_in (unit.c:3352)
1abbee
==1==    by 0x278EEB: unit_write_drop_in_private (unit.c:3403)
1abbee
==1==    by 0x190C21: bus_service_set_transient_property
1abbee
(dbus-service.c:254)
1abbee
==1==    by 0x190DBC: bus_service_set_property (dbus-service.c:284)
1abbee
==1==    by 0x18F00E: bus_unit_set_properties (dbus-unit.c:1226)
1abbee
==1==    by 0x186F6A: transient_unit_from_message (dbus-manager.c:683)
1abbee
==1==    by 0x1872B7: method_start_transient_unit (dbus-manager.c:763)
1abbee
==1==
1abbee
==1== LEAK SUMMARY:
1abbee
==1==    definitely lost: 696 bytes in 29 blocks
1abbee
==1==    indirectly lost: 5,046 bytes in 58 blocks
1abbee
==1==      possibly lost: 0 bytes in 0 blocks
1abbee
==1==    still reachable: 61,440 bytes in 4 blocks
1abbee
==1==         suppressed: 0 bytes in 0 blocks
1abbee
1abbee
Cherry-picked from: af4fbf3c1fdd4196f7a325602daaa846fe5f3012
1abbee
Related: #1331667
1abbee
---
1abbee
 src/core/load-dropin.c | 3 +++
1abbee
 1 file changed, 3 insertions(+)
1abbee
1abbee
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
c62b8e
index 8be190040e..42cf00572f 100644
1abbee
--- a/src/core/load-dropin.c
1abbee
+++ b/src/core/load-dropin.c
1abbee
@@ -68,6 +68,9 @@ int unit_load_dropin(Unit *u) {
1abbee
                 }
1abbee
         }
1abbee
 
1abbee
+        strv_free(u->dropin_paths);
1abbee
+        u->dropin_paths = NULL;
1abbee
+
1abbee
         r = unit_find_dropin_paths(u, &u->dropin_paths);
1abbee
         if (r <= 0)
1abbee
                 return 0;