summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-07-11 16:16:38 +0100
committerSimon McVittie <smcv@collabora.com>2018-08-02 17:13:02 +0100
commit9cf2d308ce289293932d40d70005e3e4e67f64d1 (patch)
tree2b68ab2d7f36ecdfa9be8bf671eda9e49c903e4a
parent4937a36c310c94644a60bc9fce8bde5f511395f5 (diff)
downloaddbus-9cf2d308ce289293932d40d70005e3e4e67f64d1.tar.gz
dbus_server_listen: Don't leak first_connect_error
If an implementation fails to listen, and a subsequent implementation succeeds, then we would have leaked this. Detected by running tests/loopback.c under valgrind. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194 (cherry picked from commit b14a4517a82f7e7e4c0b59cb663ebf77563decda)
-rw-r--r--dbus/dbus-server.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index d91df832..7a1243b8 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -680,6 +680,7 @@ dbus_server_listen (const char *address,
}
else
{
+ dbus_error_free (&first_connect_error);
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
return server;
}