From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 20 Apr 2016 13:22:46 +0000 (+0200)
Subject: shared: fix minor memory leak in log display code
X-Git-Tag: v230~150^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b45d88163b29f04bf784385f4a490b2cf206861;p=thirdparty%2Fsystemd.git

shared: fix minor memory leak in log display code
---

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 38a55525c0d..15c818ccf1d 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1040,8 +1040,8 @@ static int show_journal(FILE *f,
 }
 
 int add_matches_for_unit(sd_journal *j, const char *unit) {
+        const char *m1, *m2, *m3, *m4;
         int r;
-        char *m1, *m2, *m3, *m4;
 
         assert(j);
         assert(unit);
@@ -1073,7 +1073,9 @@ int add_matches_for_unit(sd_journal *j, const char *unit) {
         );
 
         if (r == 0 && endswith(unit, ".slice")) {
-                const char *m5 = strjoina("_SYSTEMD_SLICE=", unit);
+                const char *m5;
+
+                m5 = strjoina("_SYSTEMD_SLICE=", unit);
 
                 /* Show all messages belonging to a slice */
                 (void)(
@@ -1123,7 +1125,9 @@ int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) {
         );
 
         if (r == 0 && endswith(unit, ".slice")) {
-                char *m5 = strappend("_SYSTEMD_SLICE=", unit);
+                const char *m5;
+
+                m5 = strjoina("_SYSTEMD_SLICE=", unit);
 
                 /* Show all messages belonging to a slice */
                 (void)(