From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 27 Nov 2017 07:15:07 +0000 (+0100)
Subject: logind: make sure we don't acces m->action_what if it's not initialized (#7475)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5bb68c3767411adc506fc4ac71215f15c3c25d86;p=elogind.git

logind: make sure we don't acces m->action_what if it's not initialized (#7475)

Fixes: #7466
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 2badab1d3..e13010ecf 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1578,7 +1578,7 @@ static int execute_shutdown_or_sleep(
 
 error:
         /* Tell people that they now may take a lock again */
-        send_prepare_for(m, m->action_what, false);
+        (void) send_prepare_for(m, w, false);
 
         return r;
 }
@@ -1697,7 +1697,7 @@ int bus_manager_shutdown_or_sleep_now_or_later(
         assert(!m->action_job);
 
         /* Tell everybody to prepare for shutdown/sleep */
-        send_prepare_for(m, w, true);
+        (void) send_prepare_for(m, w, true);
 
         delayed =
                 m->inhibit_delay_max > 0 &&
@@ -2799,7 +2799,7 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
                 log_info("Operation '%s' finished.", inhibit_what_to_string(m->action_what));
 
                 /* Tell people that they now may take a lock again */
-                send_prepare_for(m, m->action_what, false);
+                (void) send_prepare_for(m, m->action_what, false);
 
                 m->action_job = mfree(m->action_job);
                 m->action_unit = NULL;