>From 770869057aea3af21e869636a2de01b77966c47b Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 21 Jul 2010 16:32:22 +0200 Subject: Watch server_set_data failure in dbus__server_setup_with_g_main --- dbus/dbus-gmain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dbus/dbus-gmain.c b/dbus/dbus-gmain.c index 7496c65..cae0915 100644 --- a/dbus/dbus-gmain.c +++ b/dbus/dbus-gmain.c @@ -655,7 +655,8 @@ dbus_server_setup_with_g_main (DBusServer *server, cs = connection_setup_new_from_old (context, old_setup); /* Nuke the old setup */ - dbus_server_set_data (server, server_slot, NULL, NULL); + if (!dbus_server_set_data (server, server_slot, NULL, NULL)) + goto nomem; old_setup = NULL; } -- 1.7.1.1