shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

activate: do not leak envp on error

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-03-31 18:18:10 -04:00
parent fb93cf7375
commit fff40a51cc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/activate/activate.c
View File

@ -137,6 +137,11 @@ static int open_sockets(int *epoll_fd, bool accept) {
count ++; 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) { STRV_FOREACH(address, arg_listen) {
log_info("Opening address %s", *address); 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) { static int launch(char* name, char **argv, char **env, int fds) {
unsigned n_env = 0, length; 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="}; static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
char _cleanup_free_ *tmp = NULL; char _cleanup_free_ *tmp = NULL;
unsigned i; unsigned i;