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

1 files changed, 31 insertions, 27 deletions

diff --git a/dbus/dbus-auth.h b/dbus/dbus-auth.h
index 0339a4f8..8309fe33 100644
--- a/dbus/dbus-auth.h
+++ b/dbus/dbus-auth.h
@@ -42,34 +42,38 @@ typedef enum
   DBUS_AUTH_STATE_AUTHENTICATED
 } DBusAuthState;
 
-DBusAuth*     _dbus_auth_server_new        (void);
-DBusAuth*     _dbus_auth_client_new        (void);
-void          _dbus_auth_ref               (DBusAuth               *auth);
-void          _dbus_auth_unref             (DBusAuth               *auth);
-DBusAuthState _dbus_auth_do_work           (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_get_bytes_to_send (DBusAuth               *auth,
-                                            const DBusString      **str);
-void          _dbus_auth_bytes_sent        (DBusAuth               *auth,
-                                            int                     bytes_sent);
-dbus_bool_t   _dbus_auth_bytes_received    (DBusAuth               *auth,
-                                            const DBusString       *str);
-dbus_bool_t   _dbus_auth_get_unused_bytes  (DBusAuth               *auth,
-                                            DBusString             *str);
-dbus_bool_t   _dbus_auth_needs_encoding    (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_encode_data       (DBusAuth               *auth,
-                                            const DBusString       *plaintext,
-                                            DBusString             *encoded);
-dbus_bool_t   _dbus_auth_needs_decoding    (DBusAuth               *auth);
-dbus_bool_t   _dbus_auth_decode_data       (DBusAuth               *auth,
-                                            const DBusString       *encoded,
-                                            DBusString             *plaintext);
-void          _dbus_auth_set_credentials   (DBusAuth               *auth,
-                                            const DBusCredentials  *credentials);
+DBusAuth*     _dbus_auth_server_new          (void);
+DBusAuth*     _dbus_auth_client_new          (void);
+void          _dbus_auth_ref                 (DBusAuth               *auth);
+void          _dbus_auth_unref               (DBusAuth               *auth);
+DBusAuthState _dbus_auth_do_work             (DBusAuth               *auth);
+dbus_bool_t   _dbus_auth_get_bytes_to_send   (DBusAuth               *auth,
+                                              const DBusString      **str);
+void          _dbus_auth_bytes_sent          (DBusAuth               *auth,
+                                              int                     bytes_sent);
+void          _dbus_auth_get_buffer          (DBusAuth               *auth,
+                                              DBusString            **buffer);
+void          _dbus_auth_return_buffer       (DBusAuth               *auth,
+                                              DBusString             *buffer,
+                                              int                     bytes_read);
+void          _dbus_auth_get_unused_bytes    (DBusAuth               *auth,
+                                              const DBusString      **str);
+void          _dbus_auth_delete_unused_bytes (DBusAuth               *auth);
+dbus_bool_t   _dbus_auth_needs_encoding      (DBusAuth               *auth);
+dbus_bool_t   _dbus_auth_encode_data         (DBusAuth               *auth,
+                                              const DBusString       *plaintext,
+                                              DBusString             *encoded);
+dbus_bool_t   _dbus_auth_needs_decoding      (DBusAuth               *auth);
+dbus_bool_t   _dbus_auth_decode_data         (DBusAuth               *auth,
+                                              const DBusString       *encoded,
+                                              DBusString             *plaintext);
+void          _dbus_auth_set_credentials     (DBusAuth               *auth,
+                                              const DBusCredentials  *credentials);
+void          _dbus_auth_get_identity        (DBusAuth               *auth,
+                                              DBusCredentials        *credentials);
+dbus_bool_t   _dbus_auth_set_context         (DBusAuth               *auth,
+                                              const DBusString       *context);
 
-void          _dbus_auth_get_identity      (DBusAuth               *auth,
-                                            DBusCredentials        *credentials);
-dbus_bool_t   _dbus_auth_set_context       (DBusAuth               *auth,
-                                            const DBusString       *context);
 
 DBUS_END_DECLS;