From 3e2e29fb00466189f49e3dd8f4a657289401351c Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 21 May 2007 16:08:03 +0000 Subject: [PATCH] r9095 invalidly removed the check for non-winsock Originally committed as revision 9096 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/os_support.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/os_support.c b/libavformat/os_support.c index b70dc2755..ded36d640 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -139,10 +139,12 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) int n; int rc; +#ifdef __MINGW32__ if (numfds >= FD_SETSIZE) { errno = EINVAL; return -1; } +#endif FD_ZERO(&read_set); FD_ZERO(&write_set); @@ -152,6 +154,12 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout) for(i = 0; i < numfds; i++) { if (fds[i].fd < 0) continue; +#ifndef __MINGW32__ + if (fds[i].fd >= FD_SETSIZE) { + errno = EINVAL; + return -1; + } +#endif if (fds[i].events & POLLIN) FD_SET(fds[i].fd, &read_set); if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set); -- 2.11.0