Don't underflow datagram_address array

3768a869 · Daniel Colascione · 13539621 · 3768a869 · 3768a869
Commit 3768a869 authored Mar 22, 2014 by Daniel Colascione
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/process.c src/process.c +4 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+	* process.c (DATAGRAM_CONN_P): Don't underflow datagram_address
+	array.  (ASAN caught.)
+
 2014-03-22  Glenn Morris  <rgm@gnu.org>

 	* callproc.c (init_callproc): In etc, look for NEWS rather than GNU.

--- a/src/process.c
+++ b/src/process.c
@@ -353,7 +353,10 @@ static struct sockaddr_and_len {
  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)