2 files changed, 8 insertions, 1 deletions
diff --git a/src/shared/strv.c b/src/shared/strv.c
index 85ae556c16..5cfab8f23e 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include "strv.h"
 
-void strv_free(char **l) {
+void strv_clear(char **l) {
         char **k;
 
         if (!l)
@@ -35,6 +35,11 @@ void strv_free(char **l) {
         for (k = l; *k; k++)
                 free(*k);
 
+        *l = NULL;
+}
+
+void strv_free(char **l) {
+        strv_clear(l);
         free(l);
 }
 
diff --git a/src/shared/strv.h b/src/shared/strv.h
index 22c8132c57..94bdbe62aa 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -28,6 +28,8 @@ void strv_free(char **l);
 DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free);
 #define _cleanup_strv_free_ _cleanup_(strv_freep)
 
+void strv_clear(char **l);
+
 char **strv_copy(char * const *l);
 unsigned strv_length(char * const *l) _pure_;