journald: before closing /dev/kmsg let's unregister the event source

[elogind.git] / src / journal / journal-vacuum.c

diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index c73ad8f3938f8ce015322b85b8b589c126ff03f8..d4a1c6c9334ff736bbe3066e7d0b317c71119b7b 100644 (file)
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -278,6 +278,8 @@ int journal_directory_vacuum(
                         } else if (errno != ENOENT)
                                 log_warning("Failed to delete %s/%s: %m", directory, p);
 
+                        free(p);
+
                         continue;
                 }
 
@@ -297,8 +299,7 @@ int journal_directory_vacuum(
                 n_list ++;
         }
 
-        if (n_list > 0)
-                qsort(list, n_list, sizeof(struct vacuum_info), vacuum_compare);
+        qsort_safe(list, n_list, sizeof(struct vacuum_info), vacuum_compare);
 
         for (i = 0; i < n_list; i++) {
                 struct statvfs ss;