summaryrefslogtreecommitdiff
path: root/src/activate/activate.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/activate/activate.c')
-rw-r--r--src/activate/activate.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/activate/activate.c b/src/activate/activate.c
index a6e7248574..3ea2470a1f 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -137,6 +137,11 @@ static int open_sockets(int *epoll_fd, bool accept) {
count ++;
}
+ /** Note: we leak some fd's on error here. I doesn't matter
+ * much, since the program will exit immediately anyway, but
+ * would be a pain to fix.
+ */
+
STRV_FOREACH(address, arg_listen) {
log_info("Opening address %s", *address);
@@ -166,7 +171,8 @@ static int open_sockets(int *epoll_fd, bool accept) {
static int launch(char* name, char **argv, char **env, int fds) {
unsigned n_env = 0, length;
- char **envp = NULL, **s;
+ char _cleanup_strv_free_ **envp = NULL;
+ char **s;
static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
char _cleanup_free_ *tmp = NULL;
unsigned i;