|
 |
1ab4435 |
From a570f01e57a9e19d0f6ec6a984bbef3f48ffea8e Mon Sep 17 00:00:00 2001
|
|
|
1ab4435 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
1ab4435 |
Date: Fri, 11 Oct 2013 19:33:20 -0400
|
|
|
1ab4435 |
Subject: [PATCH] dbus-common: avoid leak in error path
|
|
|
1ab4435 |
|
|
|
1ab4435 |
src/shared/dbus-common.c:968:33: warning: Potential leak of memory pointed to by 'l'
|
|
|
1ab4435 |
return -EINVAL;
|
|
|
1ab4435 |
^~~~~~
|
|
|
1ab4435 |
---
|
|
|
1ab4435 |
src/shared/dbus-common.c | 20 ++++++++++----------
|
|
|
1ab4435 |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
1ab4435 |
|
|
|
1ab4435 |
diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
|
|
|
674ca7d |
index b8c15cb9fc..9ec0343013 100644
|
|
|
1ab4435 |
--- a/src/shared/dbus-common.c
|
|
|
1ab4435 |
+++ b/src/shared/dbus-common.c
|
|
|
1ab4435 |
@@ -934,7 +934,7 @@ int bus_parse_strv_iter(DBusMessageIter *iter, char ***_l) {
|
|
|
1ab4435 |
int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
|
|
|
1ab4435 |
DBusMessageIter sub, sub2;
|
|
|
1ab4435 |
unsigned n = 0, i = 0;
|
|
|
1ab4435 |
- char **l;
|
|
|
1ab4435 |
+ _cleanup_strv_free_ char **l = NULL;
|
|
|
1ab4435 |
|
|
|
1ab4435 |
assert(iter);
|
|
|
1ab4435 |
assert(_l);
|
|
|
1ab4435 |
@@ -953,6 +953,7 @@ int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
|
|
|
1ab4435 |
l = new(char*, n*2+1);
|
|
|
1ab4435 |
if (!l)
|
|
|
1ab4435 |
return -ENOMEM;
|
|
|
1ab4435 |
+ l[0] = NULL; /* make sure that l is properly terminated at all times */
|
|
|
1ab4435 |
|
|
|
1ab4435 |
dbus_message_iter_recurse(iter, &sub);
|
|
|
1ab4435 |
|
|
|
1ab4435 |
@@ -968,26 +969,25 @@ int bus_parse_strv_pairs_iter(DBusMessageIter *iter, char ***_l) {
|
|
|
1ab4435 |
return -EINVAL;
|
|
|
1ab4435 |
|
|
|
1ab4435 |
l[i] = strdup(a);
|
|
|
1ab4435 |
- if (!l[i]) {
|
|
|
1ab4435 |
- strv_free(l);
|
|
|
1ab4435 |
+ if (!l[i])
|
|
|
1ab4435 |
return -ENOMEM;
|
|
|
1ab4435 |
- }
|
|
|
1ab4435 |
+ i++;
|
|
|
1ab4435 |
|
|
|
1ab4435 |
- l[++i] = strdup(b);
|
|
|
1ab4435 |
- if (!l[i]) {
|
|
|
1ab4435 |
- strv_free(l);
|
|
|
1ab4435 |
+ l[i] = strdup(b);
|
|
|
1ab4435 |
+ if (!l[i])
|
|
|
1ab4435 |
return -ENOMEM;
|
|
|
1ab4435 |
- }
|
|
|
1ab4435 |
-
|
|
|
1ab4435 |
i++;
|
|
|
1ab4435 |
+
|
|
|
1ab4435 |
dbus_message_iter_next(&sub);
|
|
|
1ab4435 |
}
|
|
|
1ab4435 |
|
|
|
1ab4435 |
assert(i == n*2);
|
|
|
1ab4435 |
l[i] = NULL;
|
|
|
1ab4435 |
|
|
|
1ab4435 |
- if (_l)
|
|
|
1ab4435 |
+ if (_l) {
|
|
|
1ab4435 |
*_l = l;
|
|
|
1ab4435 |
+ l = NULL; /* avoid freeing */
|
|
|
1ab4435 |
+ }
|
|
|
1ab4435 |
|
|
|
1ab4435 |
return 0;
|
|
|
1ab4435 |
}
|