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 --- bus/test.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'bus/test.c') diff --git a/bus/test.c b/bus/test.c index 09e40f34..7de1d811 100644 --- a/bus/test.c +++ b/bus/test.c @@ -35,18 +35,21 @@ */ static DBusList *clients = NULL; -static void +static dbus_bool_t client_watch_callback (DBusWatch *watch, unsigned int condition, void *data) { DBusConnection *connection = data; - + dbus_bool_t retval; + dbus_connection_ref (connection); - dbus_connection_handle_watch (connection, watch, condition); + retval = dbus_connection_handle_watch (connection, watch, condition); dbus_connection_unref (connection); + + return retval; } static dbus_bool_t @@ -71,7 +74,8 @@ client_timeout_callback (DBusTimeout *timeout, DBusConnection *connection = data; dbus_connection_ref (connection); - + + /* can return FALSE on OOM but we just let it fire again later */ dbus_timeout_handle (timeout); dbus_connection_unref (connection); -- cgit