Attachment 135646 Details for Bug 89104 – [12/12] _dbus_server_new_for_tcp_socket: Simplify error unwinding

[patch] [12/12] _dbus_server_new_for_tcp_socket: Simplify error unwinding

0012-_dbus_server_new_for_tcp_socket-Simplify-error-unwin.patch (text/plain), 3.51 KB, created by Simon McVittie on 2017-11-21 16:34:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-11-21 16:34:19 UTC

Size: 3.51 KB

patch

obsolete

>From c50b98e1c6d8a1f790cd147710fe6ee91ade30d9 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 21 Nov 2017 15:43:55 +0000
>Subject: [PATCH 12/12] _dbus_server_new_for_tcp_socket: Simplify error
> unwinding
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/dbus-server-socket.c | 41 +++++++++++++++++++----------------------
> 1 file changed, 19 insertions(+), 22 deletions(-)
>
>diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
>index 9e54bc52..64cfc90d 100644
>--- a/dbus/dbus-server-socket.c
>+++ b/dbus/dbus-server-socket.c
>@@ -422,28 +422,26 @@ _dbus_server_new_for_tcp_socket (const char     *host,
>                                  DBusError      *error,
>                                  dbus_bool_t    use_nonce)
> {
>-  DBusServer *server;
>+  DBusServer *server = NULL;
>   DBusSocket *listen_fds = NULL;
>   int nlisten_fds = 0, i;
>-  DBusString address;
>-  DBusString host_str;
>-  DBusString port_str;
>+  DBusString address = _DBUS_STRING_INIT_INVALID;
>+  DBusString host_str;    /* Initialized as const later, not freed */
>+  DBusString port_str = _DBUS_STRING_INIT_INVALID;
>   DBusNonceFile *noncefile = NULL;
>   
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>-  noncefile = NULL;
>-
>   if (!_dbus_string_init (&address))
>     {
>       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-      return NULL;
>+      goto failed;
>     }
> 
>   if (!_dbus_string_init (&port_str))
>     {
>       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-      goto failed_0;
>+      goto failed;
>     }
> 
>   if (host == NULL)
>@@ -463,7 +461,7 @@ _dbus_server_new_for_tcp_socket (const char     *host,
>   if (nlisten_fds <= 0)
>     {
>       _DBUS_ASSERT_ERROR_IS_SET(error);
>-      goto failed_1;
>+      goto failed;
>     }
> 
>   _dbus_string_init_const (&host_str, host);
>@@ -473,32 +471,32 @@ _dbus_server_new_for_tcp_socket (const char     *host,
>       !_dbus_string_append (&address, _dbus_string_get_const_data(&port_str)))
>     {
>       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-      goto failed_2;
>+      goto failed;
>     }
>   if (family &&
>       (!_dbus_string_append (&address, ",family=") ||
>        !_dbus_string_append (&address, family)))
>     {
>       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-      goto failed_2;
>+      goto failed;
>     }
> 
>   if (use_nonce)
>     {
>       if (!_dbus_noncefile_create (&noncefile, error))
>-        goto failed_2;
>+        goto failed;
> 
>       if (!_dbus_string_append (&address, ",noncefile=") ||
>           !_dbus_address_append_escaped (&address, _dbus_noncefile_get_path (noncefile)))
>         {
>           dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-          goto failed_2;
>+          goto failed;
>         }
>     }
> 
>   server = _dbus_server_new_for_socket (listen_fds, nlisten_fds, &address, noncefile, error);
>   if (server == NULL)
>-    goto failed_2;
>+    goto failed;
> 
>   /* server has taken ownership of noncefile and the fds in listen_fds */
>   _dbus_string_free (&port_str);
>@@ -507,19 +505,18 @@ _dbus_server_new_for_tcp_socket (const char     *host,
> 
>   return server;
> 
>- failed_2:
>+failed:
>   _dbus_noncefile_delete (&noncefile, NULL);
> 
>-  for (i = 0 ; i < nlisten_fds ; i++)
>-    _dbus_close_socket (listen_fds[i], NULL);
>-  dbus_free(listen_fds);
>+  if (listen_fds != NULL)
>+    {
>+      for (i = 0; i < nlisten_fds; i++)
>+        _dbus_close_socket (listen_fds[i], NULL);
>+      dbus_free (listen_fds);
>+    }
> 
>- failed_1:
>   _dbus_string_free (&port_str);
>-
>- failed_0:
>   _dbus_string_free (&address);
>-
>   return NULL;
> }
> 
>-- 
>2.15.0
>

Actions: View | Splinter Review

Attachments on bug 89104: 135264 | 135265 | 135634 | 135635 | 135636 | 135638 | 135639 | 135640 | 135641 | 135642 | 135643 | 135644 | 135645 | 135646 | 135738

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.