X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmisc%2Fforkpty.c;h=07f8d01eed66741e31ec3c83a07ab5d4306d2fd0;hb=31a55f233b313030a787240b76c06f2d08cde29f;hp=2d1b0ae28e5f178f181a61fee214d5cd7a9a63f4;hpb=4921ce08673d14e53b3931b8536238d944a2c1ce;p=musl

diff --git a/src/misc/forkpty.c b/src/misc/forkpty.c
index 2d1b0ae2..07f8d01e 100644
--- a/src/misc/forkpty.c
+++ b/src/misc/forkpty.c
@@ -1,21 +1,37 @@
 #include <pty.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
 
 int forkpty(int *m, char *name, const struct termios *tio, const struct winsize *ws)
 {
-	int s;
+	int s, t, i, istmp[3]={0};
 	pid_t pid;
 
 	if (openpty(m, &s, name, tio, ws) < 0) return -1;
-	pid = fork();
+
+	/* Ensure before forking that we don't exceed fd limit */
+	for (i=0; i<3; i++) {
+		if (fcntl(i, F_GETFL) < 0) {
+			t = fcntl(s, F_DUPFD, i);
+			if (t<0) break;
+			else if (t!=i) close(t);
+			else istmp[i] = 1;
+		}
+	}
+	pid = i==3 ? fork() : -1;
 	if (!pid) {
 		close(*m);
+		setsid();
+		ioctl(s, TIOCSCTTY, (char *)0);
 		dup2(s, 0);
 		dup2(s, 1);
 		dup2(s, 2);
-		close(s);
+		if (s>2) close(s);
 		return 0;
 	}
+	for (i=0; i<3; i++)
+		if (istmp[i]) close(i);
 	close(s);
 	if (pid < 0) close(*m);
 	return pid;