diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 15:49:35 -0500 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2008-01-15 15:49:35 -0500 |
commit | 4cc2bfa10e1a840e0da34a588f719779cc284a79 (patch) | |
tree | c3151c53bbf6a1ed2c5cbf1849ede20edbe235ea | |
parent | 7ba3dc8bf980857e03e0f19713adb918dcab4d15 (diff) |
check failed allocation (FDO Bug #12920)
2008-01-15 John (J5) Palmieri <johnp@redhat.com>
* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
* bus/bus.c (setup_server): check failed allocation (FDO Bug #12920)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | bus/bus.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -2,6 +2,12 @@ * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com> + * bus/bus.c (setup_server): check failed allocation (FDO Bug #12920) + +2008-01-15 John (J5) Palmieri <johnp@redhat.com> + + * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com> + * dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): the API contract says sitter_p can be NULL, so let's check it (FDO Bug #12919) @@ -208,9 +208,9 @@ setup_server (BusContext *context, BusServerData *bd; bd = dbus_new0 (BusServerData, 1); - if (!dbus_server_set_data (server, - server_data_slot, - bd, free_server_data)) + if (bd == NULL || !dbus_server_set_data (server, + server_data_slot, + bd, free_server_data)) { dbus_free (bd); BUS_SET_OOM (error); |