diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-12 10:55:43 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-12 10:55:43 +0000 |
commit | 6173ba221a4ed16892cc1b7a794cdac464de2dd2 (patch) | |
tree | 8eb90518a82e878d1cb52cbe05d37595d5b338a2 /bus | |
parent | 7c86eb023b63d3b35d529509e30552fdaa0dbf7e (diff) | |
parent | 4f1ed05afc1ed8088404993dedae57cd766cbbb6 (diff) | |
download | dbus-6173ba221a4ed16892cc1b7a794cdac464de2dd2.tar.gz |
Merge branch 'dbus-1.6'
Diffstat (limited to 'bus')
-rw-r--r-- | bus/activation.c | 2 | ||||
-rw-r--r-- | bus/services.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bus/activation.c b/bus/activation.c index 868ce05c..fa6c1568 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -2186,7 +2186,7 @@ bus_activation_list_services (BusActivation *activation, error: for (j = 0; j < i; j++) - dbus_free (retval[i]); + dbus_free (retval[j]); dbus_free (retval); return FALSE; diff --git a/bus/services.c b/bus/services.c index 6f380fac..01a720ed 100644 --- a/bus/services.c +++ b/bus/services.c @@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry, error: for (j = 0; j < i; j++) - dbus_free (retval[i]); + dbus_free (retval[j]); dbus_free (retval); return FALSE; |