From: Simon McVittie Date: Wed, 22 Jun 2011 10:59:32 +0000 (+0100) Subject: _dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked) X-Git-Tag: dbus-1.4.14~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af13ae7e43c444e1ff08d477b454bdee8cd9f892;p=platform%2Fupstream%2Fdbus.git _dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked) This block should have been deleted in 2007, when IPv6 support was added: previously, the fd allocated at the beginning of the function was used for connect(), but for IPv6 support, the socket() call has to be inside the loop over getaddrinfo() results so its address family can be changed. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258 Reviewed-by: Cosimo Alfarano --- diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index e1e1728d..d6063713 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -1161,14 +1161,6 @@ _dbus_connect_tcp_socket_with_nonce (const char *host, struct addrinfo hints; struct addrinfo *ai, *tmp; - _DBUS_ASSERT_ERROR_IS_CLEAR (error); - - if (!_dbus_open_tcp_socket (&fd, error)) - { - _DBUS_ASSERT_ERROR_IS_SET(error); - return -1; - } - _DBUS_ASSERT_ERROR_IS_CLEAR(error); _DBUS_ZERO (hints);