From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Jan 2013 19:00:01 +0000 (+0100)
Subject: dbus: fix serialization of calendar timers
X-Git-Tag: v198~594
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3761902e2e120849c283106fd4b78b6adec7367e

dbus: fix serialization of calendar timers
---

diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 11d18cbd8..b22fcb593 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -69,22 +69,28 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
                 return -ENOMEM;
 
         LIST_FOREACH(value, k, p->values) {
-                char *buf;
+                _cleanup_free_ char *buf = NULL;
                 const char *t;
                 size_t l;
                 bool b;
 
                 t = timer_base_to_string(k->base);
-                assert(endswith(t, "Sec"));
 
-                /* s/Sec/USec/ */
-                l = strlen(t);
-                buf = new(char, l+2);
-                if (!buf)
-                        return -ENOMEM;
+                if (endswith(t, "Sec")) {
+
+                        /* s/Sec/USec/ */
+                        l = strlen(t);
+                        buf = new(char, l+2);
+                        if (!buf)
+                                return -ENOMEM;
 
-                memcpy(buf, t, l-3);
-                memcpy(buf+l-3, "USec", 5);
+                        memcpy(buf, t, l-3);
+                        memcpy(buf+l-3, "USec", 5);
+                } else {
+                        buf = strdup(t);
+                        if (!buf)
+                                return -ENOMEM;
+                }
 
                 b = dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) &&
                         dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &buf) &&
@@ -92,7 +98,6 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
                         dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) &&
                         dbus_message_iter_close_container(&sub, &sub2);
 
-                free(buf);
                 if (!b)
                         return -ENOMEM;
         }