diff options
author | Havoc Pennington <hp@redhat.com> | 2003-03-17 01:54:37 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-03-17 01:54:37 +0000 |
commit | b4a1100f4f81534e2aac0141afda750f318223d4 (patch) | |
tree | 9573e47181fc32c40f4784df0d22b2c6ee4143c4 /dbus/dbus-server-debug-pipe.c | |
parent | 3caaa342e8db2cba690bb9e1a228ef3862e203d8 (diff) |
2003-03-16 Havoc Pennington <hp@pobox.com>
* 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
Diffstat (limited to 'dbus/dbus-server-debug-pipe.c')
-rw-r--r-- | dbus/dbus-server-debug-pipe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c index 8f57ae8d..46e78ddd 100644 --- a/dbus/dbus-server-debug-pipe.c +++ b/dbus/dbus-server-debug-pipe.c @@ -73,12 +73,13 @@ debug_finalize (DBusServer *server) dbus_free (server); } -static void +static dbus_bool_t debug_handle_watch (DBusServer *server, DBusWatch *watch, unsigned int flags) { - + + return TRUE; } static void @@ -211,6 +212,7 @@ _dbus_transport_debug_pipe_new (const char *server_name, { _dbus_close (client_fd, NULL); _dbus_close (server_fd, NULL); + dbus_set_result (result, DBUS_RESULT_NO_MEMORY); return NULL; } @@ -222,6 +224,7 @@ _dbus_transport_debug_pipe_new (const char *server_name, { _dbus_transport_unref (client_transport); _dbus_close (server_fd, NULL); + dbus_set_result (result, DBUS_RESULT_NO_MEMORY); return NULL; } @@ -234,6 +237,7 @@ _dbus_transport_debug_pipe_new (const char *server_name, if (connection == NULL) { _dbus_transport_unref (client_transport); + dbus_set_result (result, DBUS_RESULT_NO_MEMORY); return NULL; } |