summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-01-08 20:00:01 +0100
committerLennart Poettering <lennart@poettering.net>2013-01-08 20:00:01 +0100
commit3761902e2e120849c283106fd4b78b6adec7367e (patch)
treed8a3d5114ad5e662f3639f2faa17fe46440edf92
parent788f75a0e766738c052086e856b7c1b1b676de6b (diff)
dbus: fix serialization of calendar timers
-rw-r--r--src/core/dbus-timer.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 11d18cbd83..b22fcb5934 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;
}