chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path_lookup: moved _cleanup_lookup_paths_free_ from install.c to path-lookup.h
[elogind.git]
/
src
/
shared
/
dbus-common.c
diff --git
a/src/shared/dbus-common.c
b/src/shared/dbus-common.c
index c727cae7cd3c2fdb259dad9629d52e4a08803172..3ba2d87c4de0042399737223a40be87693fed4c8 100644
(file)
--- a/
src/shared/dbus-common.c
+++ b/
src/shared/dbus-common.c
@@
-934,7
+934,7
@@
int bus_parse_strv_iter(DBusMessageIter *iter, char ***_l) {
int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
DBusMessageIter sub, sub2;
unsigned n = 0, i = 0;
int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
DBusMessageIter sub, sub2;
unsigned n = 0, i = 0;
-
char **l
;
+
_cleanup_strv_free_ char **l = NULL
;
assert(iter);
assert(_l);
assert(iter);
assert(_l);
@@
-953,6
+953,7
@@
int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
l = new(char*, n*2+1);
if (!l)
return -ENOMEM;
l = new(char*, n*2+1);
if (!l)
return -ENOMEM;
+ l[0] = NULL; /* make sure that l is properly terminated at all times */
dbus_message_iter_recurse(iter, &sub);
dbus_message_iter_recurse(iter, &sub);
@@
-968,26
+969,25
@@
int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
return -EINVAL;
l[i] = strdup(a);
return -EINVAL;
l[i] = strdup(a);
- if (!l[i]) {
- strv_free(l);
+ if (!l[i])
return -ENOMEM;
return -ENOMEM;
- }
+ i++;
- l[++i] = strdup(b);
- if (!l[i]) {
- strv_free(l);
+ l[i] = strdup(b);
+ if (!l[i])
return -ENOMEM;
return -ENOMEM;
- }
-
i++;
i++;
+
dbus_message_iter_next(&sub);
}
assert(i == n*2);
l[i] = NULL;
dbus_message_iter_next(&sub);
}
assert(i == n*2);
l[i] = NULL;
- if (_l)
+ if (_l)
{
*_l = l;
*_l = l;
+ l = NULL; /* avoid freeing */
+ }
return 0;
}
return 0;
}