From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Oct 2012 19:24:36 +0000 (+0200)
Subject: timedatectl: properly initialize struct before decoding bus messages
X-Git-Tag: v195~78
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=599659860c770058f2eb04d578c521c16e0b1853;p=elogind.git

timedatectl: properly initialize struct before decoding bus messages
---

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 8c6e7c921..e94a847bf 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -69,11 +69,9 @@ typedef struct StatusInfo {
 } StatusInfo;
 
 static bool ntp_synced(void) {
-
         struct timex txc;
 
         zero(txc);
-
         if (adjtimex(&txc) < 0)
                 return false;
 
@@ -90,6 +88,8 @@ static void print_status_info(StatusInfo *i) {
         time_t sec;
         int r;
 
+        assert(i);
+
         n = now(CLOCK_REALTIME);
         sec = (time_t) (n / USEC_PER_SEC);
 
@@ -191,6 +191,7 @@ static int show_status(DBusConnection *bus, char **args, unsigned n) {
                 return -EIO;
         }
 
+        zero(info);
         dbus_message_iter_recurse(&iter, &sub);
 
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {