chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: pull in logger unit only when running in system mode
[elogind.git]
/
src
/
dbus-manager.c
diff --git
a/src/dbus-manager.c
b/src/dbus-manager.c
index 92a602219be536b86d8d15454dbba854599a9168..2f755bcc64dff28889710d26376af37c79a4f499 100644
(file)
--- 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 (!e)
goto oom;
- if (!(reply = dbus_message_new_method_return(message)))
+ if (!(reply = dbus_message_new_method_return(message))) {
+ strv_free(e);
goto oom;
goto oom;
+ }
strv_free(m->environment);
m->environment = e;
strv_free(m->environment);
m->environment = e;
@@
-1108,8
+1110,6
@@
static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
goto oom;
}
goto oom;
}
- free(path);
-
if (reply) {
if (!dbus_connection_send(connection, reply, NULL))
goto oom;
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);
}
dbus_message_unref(reply);
}
+ free(path);
+
return DBUS_HANDLER_RESULT_HANDLED;
oom:
return DBUS_HANDLER_RESULT_HANDLED;
oom: