diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-06-17 20:41:24 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-06-17 20:41:24 +0100 |
commit | 907c0b36e9fff225aa5a43b0be13f709bc4b9534 (patch) | |
tree | 8321ae0a61703fa055ff342db95fe5f9f71a59f4 | |
parent | 54357a96923de7c3f15c26c27901a086a0ed84a3 (diff) | |
parent | 1b892db6ddb25ecb68c92c96a5fa74644c9d71b9 (diff) | |
download | dbus-907c0b36e9fff225aa5a43b0be13f709bc4b9534.tar.gz |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | bus/driver.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -27,6 +27,11 @@ Configuration changes: (fd.o #89280, Dimitri John Ledkov) +Fixes: + +• Fix a memory leak when GetConnectionCredentials() succeeds + (fd.o #91008, Jacek Bukarewicz) + D-Bus 1.9.16 (2015-05-14) == diff --git a/bus/driver.c b/bus/driver.c index 23e75a21..379a47ee 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -1755,6 +1755,8 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection, goto oom; } + dbus_message_unref (reply); + return TRUE; oom: |