summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2016-01-15 09:03:34 +0100
committerDaniel Mack <github@zonque.org>2016-01-15 09:03:34 +0100
commitbf8febb96a1387169b8d89357828d7fed366127f (patch)
tree104489c12c5d60da2108e7875ca5b49a78cf7fa1
parent50b480246cf28820fb7b80894cb110402d8eecdf (diff)
parentcb2f9d3f296bc80b55f09880d61dfdf47fc98212 (diff)
Merge pull request #2328 from evverx/fix-transient-units-memeory-leak
Fix transient units memory leak
-rw-r--r--src/core/load-dropin.c1
-rw-r--r--test/test-functions11
2 files changed, 12 insertions, 0 deletions
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 3fa66f91aa..569632e13b 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -65,6 +65,7 @@ int unit_load_dropin(Unit *u) {
}
}
+ u->dropin_paths = strv_free(u->dropin_paths);
r = unit_find_dropin_paths(u, &u->dropin_paths);
if (r <= 0)
return 0;
diff --git a/test/test-functions b/test/test-functions
index 80d048c0d2..03753db38a 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -138,6 +138,17 @@ install_valgrind() {
dracut_install $_valgrind_dbg_and_supp
}
+create_valgrind_wrapper() {
+ local _valgrind_wrapper=$initdir/$ROOTLIBDIR/systemd-under-valgrind
+ ddebug "Create $_valgrind_wrapper"
+ cat >$_valgrind_wrapper <<EOF
+#!/bin/bash
+
+exec valgrind --leak-check=full --log-file=/valgrind.out $ROOTLIBDIR/systemd "\$@"
+EOF
+ chmod 0755 $_valgrind_wrapper
+}
+
install_dmevent() {
instmods dm_crypt =crypto
type -P dmeventd >/dev/null && dracut_install dmeventd