summaryrefslogtreecommitdiff
path: root/src/dbus-manager.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-31 15:35:40 +0200
committerLennart Poettering <lennart@poettering.net>2011-03-31 15:35:40 +0200
commitda19d5c19f60ec80e1733b1e994311c59c6eda73 (patch)
tree1df3b703d728471e1051e23778f857bf4adff23f /src/dbus-manager.c
parentba1a55152c50dfbcd3d4a64353b95f4a2f37985e (diff)
src: our lord is coverity
Diffstat (limited to 'src/dbus-manager.c')
-rw-r--r--src/dbus-manager.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 92a602219b..2f755bcc64 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -1020,8 +1020,10 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
if (!e)
goto oom;
- if (!(reply = dbus_message_new_method_return(message)))
+ if (!(reply = dbus_message_new_method_return(message))) {
+ strv_free(e);
goto oom;
+ }
strv_free(m->environment);
m->environment = e;
@@ -1108,8 +1110,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
goto oom;
}
- free(path);
-
if (reply) {
if (!dbus_connection_send(connection, reply, NULL))
goto oom;
@@ -1117,6 +1117,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
dbus_message_unref(reply);
}
+ free(path);
+
return DBUS_HANDLER_RESULT_HANDLED;
oom: