From 820544f210b5485fac51285e9c02c2c8351cb005 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 9 Jul 2018 17:06:22 +0100 Subject: [PATCH 1/7] Assert that DBUS_SERVER_LISTEN_ADDRESS_ALREADY_USED does not set error The only place this is set in practice is in dbus-server-win.c, which does not set the error. If it did, dbus_server_listen() would leak it. Signed-off-by: Simon McVittie --- dbus/dbus-server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index d91df832..f26a8f7c 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -595,6 +595,7 @@ dbus_server_listen (const char *address, else if (result == DBUS_SERVER_LISTEN_ADDRESS_ALREADY_USED) { _dbus_assert (server == NULL); + _DBUS_ASSERT_ERROR_IS_CLEAR (&tmp_error); dbus_set_error (error, DBUS_ERROR_ADDRESS_IN_USE, "Address '%s' already used", -- 2.18.0