]> git.eshelyaron.com Git - emacs.git/commitdiff
Minor improvements to FD_SETSIZE overflow checks.
authorPhilipp Stephani <phst@google.com>
Wed, 30 Dec 2020 21:36:07 +0000 (22:36 +0100)
committerPhilipp Stephani <phst@google.com>
Wed, 30 Dec 2020 23:31:21 +0000 (00:31 +0100)
* src/process.c (Fmake_serial_process): Add port to error data.
(connect_network_socket): Add an explanatory comment.

src/process.c

index ba2bb3c9e461af9147819d3deeab2fe2acdbffe6..e845e2055e3f8ab1952d91a2efbfe5400e92d03a 100644 (file)
@@ -3068,7 +3068,7 @@ usage:  (make-serial-process &rest ARGS)  */)
   fd = serial_open (port);
   p->open_fd[SUBPROCESS_STDIN] = fd;
   if (FD_SETSIZE <= fd)
-    report_file_errno ("Opening serial port", Qnil, EMFILE);
+    report_file_errno ("Opening serial port", port, EMFILE);
   p->infd = fd;
   p->outfd = fd;
   if (fd > max_desc)
@@ -3332,6 +3332,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos,
              xerrno = errno;
              continue;
            }
+         /* Reject file descriptors that would be too large.  */
          if (FD_SETSIZE <= s)
            {
              emacs_close (s);