1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 3761902e2e120849c283106fd4b78b6adec7367e Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Jan 2013 20:00:01 +0100
Subject: [PATCH] dbus: fix serialization of calendar timers
---
src/core/dbus-timer.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 11d18cb..b22fcb5 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;
}
--
1.8.1
|