From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 13 Jun 2016 16:54:36 +0000 (+0200)
Subject: systemctl: fix assertion hit when showing state of a unit without control group
X-Git-Tag: v231~161^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51e22f8851fae578188bd190510a205f0e4487f4;p=thirdparty%2Fsystemd.git

systemctl: fix assertion hit when showing state of a unit without control group
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 784c1cd7b5c..74ef2d7ba14 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3847,14 +3847,13 @@ static void print_status_info(
                 printf("      CPU: %s\n", format_timespan(buf, sizeof(buf), i->cpu_usage_nsec / NSEC_PER_USEC, USEC_PER_MSEC));
         }
 
-        if (i->control_group)
-                printf("   CGroup: %s\n", i->control_group);
-
-        {
+        if (i->control_group) {
                 _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
                 static const char prefix[] = "           ";
                 unsigned c;
 
+                printf("   CGroup: %s\n", i->control_group);
+
                 c = columns();
                 if (c > sizeof(prefix) - 1)
                         c -= sizeof(prefix) - 1;