systemctl: check if iterator was initialized succesfully

[elogind.git] / src / systemctl / systemctl.c

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 418a80b6f0375e064ca5cd738e9291901f47a5a8..99286cfc75b61eeceec6d00f7c8244cfd3344aee 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2084,7 +2084,11 @@ static int get_cgroup_attr(DBusConnection *bus, char **args) {
                 if (r < 0)
                         return r;
 
-                dbus_message_iter_init(reply, &iter);
+                if (!dbus_message_iter_init(reply, &iter)) {
+                        log_error("Failed to initialize iterator.");
+                        return -EIO;
+                }
+
                 r = bus_parse_strv_iter(&iter, &list);
                 if (r < 0) {
                         log_error("Failed to parse value list.");
@@ -3951,7 +3955,7 @@ static int enable_unit(DBusConnection *bus, char **args) {
                 }
 
                 /* Try to reload if enabeld */
-                if (!arg_no_reload && running_in_chroot() <= 0)
+                if (!arg_no_reload)
                         r = daemon_reload(bus, args);
         }