oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(*): check that fds are not too large to select on

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9097 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-10-08 13:15:33 +00:00
parent a42f3a3c25
commit df4a780888
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appl/ftp/ftp/ftp.c
View File

@@ -530,9 +530,9 @@ empty (fd_set * mask, int sec)
{ {
struct timeval t; struct timeval t;
t.tv_sec = (long) sec; t.tv_sec = sec;
t.tv_usec = 0; t.tv_usec = 0;
return (select (32, mask, NULL, NULL, &t)); return (select (FD_SETSIZE, mask, NULL, NULL, &t));
} }
jmp_buf sendabort; jmp_buf sendabort;
@@ -1627,6 +1627,8 @@ abort:
pswitch (!proxy); pswitch (!proxy);
if (cpend) { if (cpend) {
FD_ZERO (&mask); FD_ZERO (&mask);
if (fileno(cin) >= FD_SETSIZE)
errx (1, "fd too large");
FD_SET (fileno (cin), &mask); FD_SET (fileno (cin), &mask);
if ((nfnd = empty (&mask, 10)) <= 0) { if ((nfnd = empty (&mask, 10)) <= 0) {
if (nfnd < 0) { if (nfnd < 0) {
@@ -1655,6 +1657,8 @@ reset (int argc, char **argv)
FD_ZERO (&mask); FD_ZERO (&mask);
while (nfnd > 0) { while (nfnd > 0) {
if (fileno (cin) >= FD_SETSIZE)
errx (1, "fd too large");
FD_SET (fileno (cin), &mask); FD_SET (fileno (cin), &mask);
if ((nfnd = empty (&mask, 0)) < 0) { if ((nfnd = empty (&mask, 0)) < 0) {
warn ("reset"); warn ("reset");
@@ -1728,8 +1732,12 @@ abort_remote (FILE * din)
fprintf (cout, "%cABOR\r\n", DM); fprintf (cout, "%cABOR\r\n", DM);
fflush (cout); fflush (cout);
FD_ZERO (&mask); FD_ZERO (&mask);
if (fileno (cin) >= FD_SETSIZE)
errx (1, "fd too large");
FD_SET (fileno (cin), &mask); FD_SET (fileno (cin), &mask);
if (din) { if (din) {
if (fileno (din) >= FD_SETSIZE)
errx (1, "fd too large");
FD_SET (fileno (din), &mask); FD_SET (fileno (din), &mask);
} }
if ((nfnd = empty (&mask, 10)) <= 0) { if ((nfnd = empty (&mask, 10)) <= 0) {