Attachment 48278 Details for Bug 37258 – [PATCH 1/3] _dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked)

[patch] [PATCH 1/3] _dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked)

0001-_dbus_connect_tcp_socket_with_nonce-don-t-create-an-.patch (text/plain), 1.22 KB, created by Simon McVittie on 2011-06-22 04:51:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-22 04:51:39 UTC

Size: 1.22 KB

patch

obsolete

>From 082e9daf48d9f5c71c890ceb61d63e7760d20727 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 22 Jun 2011 11:59:32 +0100
>Subject: [PATCH 1/3] _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
>---
> dbus/dbus-sysdeps-unix.c |    8 --------
> 1 files changed, 0 insertions(+), 8 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index e1e1728..d606371 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);
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 37258: 48278 | 48279 | 48280

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.