From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 21 Feb 2011 18:26:53 +0000 (+0100)
Subject: dbus: don't rely that timer/path units have an initialized unit field
X-Git-Tag: v19~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b284eabdc14683e4587baf43e83cedc6698a42df

dbus: don't rely that timer/path units have an initialized unit field
---

diff --git a/src/dbus-path.c b/src/dbus-path.c
index 9692d6a24..6155792d0 100644
--- a/src/dbus-path.c
+++ b/src/dbus-path.c
@@ -72,10 +72,24 @@ static int bus_path_append_paths(Manager *m, DBusMessageIter *i, const char *pro
         return 0;
 }
 
+static int bus_path_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+        Unit *u = data;
+        const char *t;
+
+        assert(m);
+        assert(i);
+        assert(property);
+        assert(u);
+
+        t = u->path.unit ? u->path.unit->meta.id : "";
+
+        return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
+}
+
 DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
-                { "org.freedesktop.systemd1.Path", "Unit",  bus_property_append_string, "s",     u->path.unit->meta.id  },
+                { "org.freedesktop.systemd1.Path", "Unit",  bus_path_append_unit,       "s",     u                      },
                 { "org.freedesktop.systemd1.Path", "Paths", bus_path_append_paths,      "a(ss)", u                      },
                 { NULL, NULL, NULL, NULL, NULL }
         };
diff --git a/src/dbus-timer.c b/src/dbus-timer.c
index 56044661e..f4c23e0ea 100644
--- a/src/dbus-timer.c
+++ b/src/dbus-timer.c
@@ -96,10 +96,24 @@ static int bus_timer_append_timers(Manager *m, DBusMessageIter *i, const char *p
         return 0;
 }
 
+static int bus_timer_append_unit(Manager *m, DBusMessageIter *i, const char *property, void *data) {
+        Unit *u = data;
+        const char *t;
+
+        assert(m);
+        assert(i);
+        assert(property);
+        assert(u);
+
+        t = u->timer.unit ? u->timer.unit->meta.id : "";
+
+        return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
+}
+
 DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
-                { "org.freedesktop.systemd1.Timer", "Unit",           bus_property_append_string, "s",      u->timer.unit->meta.id },
+                { "org.freedesktop.systemd1.Timer", "Unit",           bus_timer_append_unit,      "s",      u                      },
                 { "org.freedesktop.systemd1.Timer", "Timers",         bus_timer_append_timers,    "a(stt)", u                      },
                 { "org.freedesktop.systemd1.Timer", "NextElapseUSec", bus_property_append_usec,   "t",      &u->timer.next_elapse  },
                 { NULL, NULL, NULL, NULL, NULL }