diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-22 23:12:15 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-24 00:25:04 -0400 |
| commit | ef42202ac8ed27e7ff1fc90ef8bc2590046dff25 (patch) | |
| tree | b1646eeb8ef5070337ae701ffb4abf0e398640ad /src/core/dbus-manager.c | |
| parent | c79bb9e4e2e5b96b2ae2c432bf8b0ff9674fce60 (diff) | |
Add set_consume which always takes ownership
Freeing in error path is the common pattern with set_put().
Diffstat (limited to 'src/core/dbus-manager.c')
| -rw-r--r-- | src/core/dbus-manager.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index d767dd5236..1f5a7d94fd 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1186,11 +1186,9 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, if (!client) goto oom; - r = set_put(s, client); - if (r < 0) { - free(client); + r = set_consume(s, client); + if (r < 0) return bus_send_error_reply(connection, message, NULL, r); - } reply = dbus_message_new_method_return(message); if (!reply) |