[Emacs-diffs] trunk r117243: * process.c (wait_reading_process_output): Omit incorrect test

[Paul Eggert]

------------------------------------------------------------
revno: 117243
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-02 17:44:30 -0700
message:
  * process.c (wait_reading_process_output): Omit incorrect test
  
  of p->infd against zero.  Add easserts for infd having a plausible
  value.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-02 18:01:21 +0000
+++ b/src/ChangeLog     2014-06-03 00:44:30 +0000
@@ -1,3 +1,9 @@
+2014-06-03  Paul Eggert  <address@hidden>
+
+       * process.c (wait_reading_process_output): Omit incorrect test
+       of p->infd against zero.  Add easserts for infd having a plausible
+       value.
+
 2014-06-02  Dmitry Antipov  <address@hidden>
 
        Adjust to match recent lwlib changes.

=== modified file 'src/process.c'
--- a/src/process.c     2014-05-27 03:46:30 +0000
+++ b/src/process.c     2014-06-03 00:44:30 +0000
@@ -4630,12 +4630,13 @@
                      {
                        struct Lisp_Process *p =
                          XPROCESS (chan_process[channel]);
-                       if (p && p->gnutls_p && p->gnutls_state && p->infd
+                       if (p && p->gnutls_p && p->gnutls_state
                            && ((emacs_gnutls_record_check_pending
                                 (p->gnutls_state))
                                > 0))
                          {
                            nfds++;
+                           eassert (p->infd == channel);
                            FD_SET (p->infd, &Available);
                          }
                      }
@@ -4651,6 +4652,8 @@
                          > 0))
                    {
                      nfds = 1;
+                     eassert (0 <= wait_proc->infd
+                              && wait_proc->infd < FD_SETSIZE);
                      /* Set to Available.  */
                      FD_SET (wait_proc->infd, &Available);
                    }