From b4a1100f4f81534e2aac0141afda750f318223d4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 17 Mar 2003 01:54:37 +0000 Subject: 2003-03-16 Havoc Pennington * dbus/dbus-watch.c (_dbus_watch_new): handle failure to malloc the watch * dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new): add some missing dbus_set_result * bus/dispatch.c (bus_dispatch_add_connection): handle failure to alloc the DBusMessageHandler * dbus/dbus-transport.c (_dbus_transport_disconnect): don't ref the transport here, since we call this from the finalizer; it resulted in a double-finalize. * dbus/dbus-transport.c (_dbus_transport_disconnect): fix a bug where we tried to use transport->connection that was NULL, happened when transport was disconnected early on due to OOM * bus/*.c: adapt to handle OOM for watches/timeouts * dbus/dbus-transport-unix.c: port to handle OOM during watch handling * dbus/dbus-auth.c (_dbus_auth_get_unused_bytes): return a reference to unused bytes instead of a copy * dbus/dbus-server.c (dbus_server_handle_watch): return FALSE for out of memory * dbus/dbus-connection.c (dbus_connection_handle_watch): return FALSE on OOM * dbus/dbus-timeout.c (dbus_timeout_handle): return FALSE for out of memory --- dbus/dbus-server-unix.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'dbus/dbus-server-unix.c') diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c index a181a925..88cc9ed7 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -70,7 +70,8 @@ unix_finalize (DBusServer *server) * us to drop the last ref to the connection before * disconnecting it. That is invalid. */ -static void +/* Return value is just for memory, not other failures. */ +static dbus_bool_t handle_new_client_fd (DBusServer *server, int client_fd) { @@ -80,13 +81,13 @@ handle_new_client_fd (DBusServer *server, _dbus_verbose ("Creating new client connection with fd %d\n", client_fd); if (!_dbus_set_fd_nonblocking (client_fd, NULL)) - return; + return TRUE; transport = _dbus_transport_new_for_fd (client_fd, TRUE); if (transport == NULL) { close (client_fd); - return; + return FALSE; } /* note that client_fd is now owned by the transport, and will be @@ -97,7 +98,7 @@ handle_new_client_fd (DBusServer *server, _dbus_transport_unref (transport); if (connection == NULL) - return; + return FALSE; _dbus_connection_set_connection_counter (connection, server->connection_counter); @@ -116,9 +117,11 @@ handle_new_client_fd (DBusServer *server, /* If no one grabbed a reference, the connection will die. */ dbus_connection_unref (connection); + + return TRUE; } -static void +static dbus_bool_t unix_handle_watch (DBusServer *server, DBusWatch *watch, unsigned int flags) @@ -151,7 +154,9 @@ unix_handle_watch (DBusServer *server, else { _dbus_fd_set_close_on_exec (client_fd); - handle_new_client_fd (server, client_fd); + + if (!handle_new_client_fd (server, client_fd)) + _dbus_verbose ("Rejected client connection due to lack of memory\n"); } } @@ -160,6 +165,8 @@ unix_handle_watch (DBusServer *server, if (flags & DBUS_WATCH_HANGUP) _dbus_verbose ("Hangup on server listening socket\n"); + + return TRUE; } static void -- cgit