diff options
| author | Corey Farrell <git@cfware.com> | 2016-02-09 15:21:05 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-02-09 14:39:35 -0600 |
| commit | 68643f83cd213e87619fa2e0d11ef38c4b2d6b6a (patch) | |
| tree | 0b931590e552be09212b4b4386d302dac2457b30 | |
| parent | cf89aecc8a9aa9bffeac2ee0ae2bd3781d0ec347 (diff) | |
Simplify and fix conditional in FD_SET.
FD_SET contains a conditional statement to protect against buffer
overruns. The statement was overly complicated and prevented use
of the last array element of ast_fdset. We now just verify the fd
is less than ast_FDMAX.
Change-Id: I41895c0b497b052aef5bf49d75c817c48b326f40
| -rw-r--r-- | include/asterisk/select.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asterisk/select.h b/include/asterisk/select.h index d6d34fbbd..d6f9d32cc 100644 --- a/include/asterisk/select.h +++ b/include/asterisk/select.h @@ -58,9 +58,7 @@ typedef struct { #define FD_SET(fd, fds) \ do { \ TYPEOF_FD_SET_FDS_BITS *bytes = (TYPEOF_FD_SET_FDS_BITS *) fds; \ - /* 32bit: FD / 32 + ((FD + 1) % 32 ? 1 : 0) < 1024 */ \ - /* 64bit: FD / 64 + ((FD + 1) % 64 ? 1 : 0) < 512 */ \ - if (fd / _bitsize(*bytes) + ((fd + 1) % _bitsize(*bytes) ? 1 : 0) < sizeof(*(fds)) / SIZEOF_FD_SET_FDS_BITS) { \ + if (fd < ast_FDMAX) { \ bytes[fd / _bitsize(*bytes)] |= ((TYPEOF_FD_SET_FDS_BITS) 1) << (fd % _bitsize(*bytes)); \ } else { \ fprintf(stderr, "FD %d exceeds the maximum size of ast_fdset!\n", fd); \ |