diff options
author | Anders Carlsson <andersca@codefactory.se> | 2003-01-14 11:19:06 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@codefactory.se> | 2003-01-14 11:19:06 +0000 |
commit | 1b9a4589f6836641ded324b7b5d003c5cbfb0b78 (patch) | |
tree | f2e1993b8d95b447e1a0f203065044a18c12a984 /bus | |
parent | a22c4589d8cc14d94537694476dc96c33c2bfcb4 (diff) |
2003-01-14 Anders Carlsson <andersca@codefactory.se>
* 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.
Diffstat (limited to 'bus')
-rw-r--r-- | bus/connection.c | 5 | ||||
-rw-r--r-- | bus/main.c | 3 |
2 files changed, 5 insertions, 3 deletions
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; @@ -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); |