Avoid erroneous syscalls

* process.c (create_process): Avoid using invalid file descriptors.

* callproc.c (child_setup): Avoid closing a file descriptor twice.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/process.c b/src/process.c
index 22b85ff5910..24f31220d0d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2038,7 +2038,7 @@ create_process (process, new_argv, current_dir)
            process_set_signal to fail on SGI when using a pipe.  */
         setsid ();
         /* Make the pty's terminal the controlling terminal.  */
-        if (pty_flag)
+        if (pty_flag && xforkin >= 0)
           {
 #ifdef TIOCSCTTY
             /* We ignore the return value
@@ -2081,8 +2081,11 @@ create_process (process, new_argv, current_dir)
             /* I wonder: would just ioctl (0, TIOCNOTTY, 0) work here?
                I can't test it since I don't have 4.3.  */
             int j = emacs_open ("/dev/tty", O_RDWR, 0);
-            ioctl (j, TIOCNOTTY, 0);
-            emacs_close (j);
+            if (j >= 0)
+              {
+                ioctl (j, TIOCNOTTY, 0);
+                emacs_close (j);
+              }
 #ifndef USG
             /* In order to get a controlling terminal on some versions
                of BSD, it is necessary to put the process in pgrp 0