[Emacs-diffs] trunk r116851: Don't underflow datagram_address array

[Daniel Colascione]

------------------------------------------------------------
revno: 116851
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: debug
timestamp: Sat 2014-03-22 22:15:48 -0700
message:
  Don't underflow datagram_address array
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-03-22 23:47:20 +0000
+++ b/src/ChangeLog     2014-03-23 05:15:48 +0000
@@ -1,3 +1,8 @@
+2014-03-23  Daniel Colascione  <address@hidden>
+
+       * process.c (DATAGRAM_CONN_P): Don't underflow datagram_address
+       array.  (ASAN caught.)
+
 2014-03-22  Glenn Morris  <address@hidden>
 
        * callproc.c (init_callproc): In etc, look for NEWS rather than GNU.

=== modified file 'src/process.c'
--- a/src/process.c     2014-03-22 03:04:24 +0000
+++ b/src/process.c     2014-03-23 05:15:48 +0000
@@ -353,7 +353,10 @@
   int len;
 } datagram_address[FD_SETSIZE];
 #define DATAGRAM_CHAN_P(chan)  (datagram_address[chan].sa != 0)
-#define DATAGRAM_CONN_P(proc)  (PROCESSP (proc) && datagram_address[XPROCESS 
(proc)->infd].sa != 0)
+#define DATAGRAM_CONN_P(proc)                                           \
+  (PROCESSP (proc) &&                                                   \
+   XPROCESS (proc)->infd >= 0 &&                                        \
+   datagram_address[XPROCESS (proc)->infd].sa != 0)
 #else
 #define DATAGRAM_CHAN_P(chan)  (0)
 #define DATAGRAM_CONN_P(proc)  (0)