Attachment 42055 Details for Bug 33128 – clean up nonce file more reliably in _dbus_server_new_for_tcp_socket

[patch] clean up nonce file more reliably in _dbus_server_new_for_tcp_socket

CID-35545.patch (text/plain), 2.03 KB, created by Simon McVittie on 2011-01-14 10:28:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-14 10:28:27 UTC

Size: 2.03 KB

patch

obsolete

>--- a/dbus/dbus-server-socket.c	
>+++ a/dbus/dbus-server-socket.c	
>@@ -270,7 +270,7 @@ static const DBusServerVTable socket_vtable = {
>  * @param fds list of file descriptors.
>  * @param n_fds number of file descriptors
>  * @param address the server's address
>- * @param use_nonce whether to create and use a nonce for authentication
>+ * @param noncefile to be used for authentication (NULL if not needed)
>  * @returns the new server, or #NULL if no memory.
>  *
>  */
>@@ -343,12 +343,6 @@ _dbus_server_new_for_socket (int              *fds,
> 
>   return (DBusServer*) socket_server;
> 
>- failed_3:
>-  if (socket_server->noncefile)
>-    {
>-      _dbus_noncefile_delete (socket_server->noncefile, NULL);
>-      dbus_free (socket_server->noncefile );
>-    }
>  failed_2:
>   for (i = 0 ; i < n_fds ; i++)
>     {
>@@ -461,16 +455,18 @@ _dbus_server_new_for_tcp_socket (const char     *host,
>       noncefile = dbus_new0 (DBusNonceFile, 1);
>       if (noncefile == NULL)
>         {
>+          dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>           goto failed_2;
>         }
> 
>-      if (!_dbus_noncefile_create (noncefile, NULL))
>-          goto failed_2;
>+      if (!_dbus_noncefile_create (noncefile, error))
>+          goto failed_3;
> 
>       if (!_dbus_string_append (&address, ",noncefile=") ||
>           !_dbus_address_append_escaped (&address, _dbus_noncefile_get_path (noncefile)))
>         {
>-          goto failed_2;
>+          dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>+          goto failed_4;
>         }
> 
>     }
>@@ -479,7 +475,7 @@ _dbus_server_new_for_tcp_socket (const char     *host,
>   if (server == NULL)
>     {
>       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-      goto failed_2;
>+      goto failed_4;
>     }
> 
>   _dbus_string_free (&port_str);
>@@ -488,6 +484,12 @@ _dbus_server_new_for_tcp_socket (const char     *host,
> 
>   return server;
> 
>+ failed_4:
>+  _dbus_noncefile_delete (noncefile, NULL);
>+
>+ failed_3:
>+  dbus_free (noncefile);
>+
>  failed_2:
>   for (i = 0 ; i < nlisten_fds ; i++)
>     _dbus_close_socket (listen_fds[i], NULL);

Actions: View | Splinter Review

Attachments on bug 33128: 42049 | 42050 | 42051 | 42053 | 42054 | 42055 | 42056 | 42057 | 42058 | 42059 | 42060 | 42061 | 42543 | 42544

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.