From 1b9a4589f6836641ded324b7b5d003c5cbfb0b78 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 14 Jan 2003 11:19:06 +0000 Subject: 2003-01-14 Anders Carlsson * bus/connection.c: (connection_error_handler), (bus_connection_setup): * bus/main.c: (main): Make sure that the DBusConnectionData struct is NULLed out to prevent a segfault. * dbus/dbus-errors.c: (dbus_result_to_string): * dbus/dbus-errors.h: * dbus/dbus-message.c: (dbus_message_get_fields), (dbus_message_get_fields_valist), (_dbus_message_test): * dbus/dbus-message.h: Make dbus_message_get_fields return a result code so we can track invalid fields as well as oom. --- bus/connection.c | 5 +++-- bus/main.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'bus') diff --git a/bus/connection.c b/bus/connection.c index 5b7c5391..f4c19dd2 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -43,7 +43,7 @@ connection_error_handler (DBusConnection *connection, { BusConnectionData *d; BusService *service; - + _dbus_warn ("Error on connection: %s\n", dbus_result_to_string (error_code)); @@ -123,7 +123,8 @@ bus_connection_setup (DBusConnection *connection) { BusConnectionData *d; - d = dbus_new (BusConnectionData, 1); + d = dbus_new0 (BusConnectionData, 1); + if (d == NULL) return FALSE; diff --git a/bus/main.c b/bus/main.c index 77fb1440..27720fbc 100644 --- a/bus/main.c +++ b/bus/main.c @@ -95,7 +95,8 @@ main (int argc, char **argv) dbus_server_set_new_connection_function (server, new_connection_callback, NULL, NULL); - + + _dbus_verbose ("We are on D-Bus...\n"); bus_loop_run (); dbus_server_disconnect (server); -- cgit