Backport memory fix (2014-03-23T05:15:48Z!dancol@dancol.org) from trunk

e611af50 · Daniel Colascione · 7eab98da · e611af50 · e611af50
Commit e611af50 authored Mar 22, 2014 by Daniel Colascione
Hide 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-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

 	Fix regression introduced by patch for Bug#10500.

--- 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)