fixed fd leak in daemonize

2 files changed, 9 insertions, 6 deletions

diff --git a/utils.c b/utils.c
index cc366741..07b15f53 100644
--- a/utils.c
+++ b/utils.c
@@ -187,9 +187,12 @@ void daemonize(char *logfile) {
 	}
 
 	/* stdin */
-	if (dup2(fdin, 0) < 0) {
-		uwsgi_error("dup2()");
-		exit(1);
+	if (fdin != 0) {
+		if (dup2(fdin, 0) < 0) {
+			uwsgi_error("dup2()");
+			exit(1);
+		}
+		close(fdin);
 	}
 
 
@@ -2696,6 +2699,7 @@ void spawn_daemon(struct uwsgi_daemon *ud) {
 				uwsgi_error("dup2()");
 				exit(1);
 			}
+			close(devnull);
 		}
 
 		if (setsid() < 0) {
diff --git a/uwsgi.c b/uwsgi.c
index e0de65ea..a5a2b2f5 100644
--- a/uwsgi.c
+++ b/uwsgi.c
@@ -2821,9 +2821,8 @@ nextsock:
 		}
 
 		if (!enabled) {
-			int fd = uwsgi_sock->fd;
-			close(fd);
-			fd = open("/dev/null", O_RDONLY);
+			close(uwsgi_sock->fd);
+			int fd = open("/dev/null", O_RDONLY);
 			if (fd < 0) {
 				uwsgi_error_open("/dev/null");
 				exit(1);