virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

os_support: Don't compare a negative number against socket descriptors

Browse Source 
The fds are unsigned integers in the windows definition of struct
sockfds. Due to this, the comparison if (fds[i].fd > n) was always
false.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-06-24 22:36:37 +03:00
parent 5aff37d28d
commit 71078ad333
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/os_support.c
View File

@ -286,7 +286,7 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
FD_ZERO(&write_set); FD_ZERO(&write_set);
FD_ZERO(&exception_set); FD_ZERO(&exception_set);
n = -1; n = 0;
for(i = 0; i < numfds; i++) { for(i = 0; i < numfds; i++) {
if (fds[i].fd < 0) if (fds[i].fd < 0)
continue; continue;
@ -301,22 +301,22 @@ int poll(struct pollfd *fds, nfds_t numfds, int timeout)
if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set); if (fds[i].events & POLLOUT) FD_SET(fds[i].fd, &write_set);
if (fds[i].events & POLLERR) FD_SET(fds[i].fd, &exception_set); if (fds[i].events & POLLERR) FD_SET(fds[i].fd, &exception_set);
if (fds[i].fd > n) if (fds[i].fd >= n)
n = fds[i].fd; n = fds[i].fd + 1;
}; };
if (n == -1) if (n == 0)
/* Hey!? Nothing to poll, in fact!!! */ /* Hey!? Nothing to poll, in fact!!! */
return 0; return 0;
if (timeout < 0) if (timeout < 0)
rc = select(n+1, &read_set, &write_set, &exception_set, NULL); rc = select(n, &read_set, &write_set, &exception_set, NULL);
else { else {
struct timeval tv; struct timeval tv;
tv.tv_sec = timeout / 1000; tv.tv_sec = timeout / 1000;
tv.tv_usec = 1000 * (timeout % 1000); tv.tv_usec = 1000 * (timeout % 1000);
rc = select(n+1, &read_set, &write_set, &exception_set, &tv); rc = select(n, &read_set, &write_set, &exception_set, &tv);
}; };
if (rc < 0) if (rc < 0)