Merge branch 'dbus-1.6'

This commit is contained in:
Simon McVittie 2013-11-12 10:55:43 +00:00
commit 6173ba221a
3 changed files with 5 additions and 2 deletions

3
NEWS
View file

@ -3,6 +3,9 @@ D-Bus 1.7.10 (UNRELEASED)
Fixes:
• don't leak memory on out-of-memory while listing activatable or
active services (fd.o #71526, Radoslaw Pajak)
• fix undefined behaviour in a regression test (fd.o #69924, DreamNik)
• on SELinux systems, don't assume that SECCLASS_DBUS, DBUS__ACQUIRE_SVC

View file

@ -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;

View file

@ -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;