kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rdpdr_add_fds: Corrected patch that prevents adding invalid FDs to the

Browse Source 
select FD sets.


git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@672 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2004-04-19 08:24:54 +00:00
parent ac166d9439
commit 2df54194b1
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rdpdr.c
View File

@ -60,7 +60,7 @@ extern DEVICE_FNS printer_fns;
extern DEVICE_FNS parallel_fns; extern DEVICE_FNS parallel_fns;
extern DEVICE_FNS disk_fns; extern DEVICE_FNS disk_fns;
extern FILEINFO g_fileinfo[]; extern FILEINFO g_fileinfo[];
static VCHANNEL *rdpdr_channel; static VCHANNEL *rdpdr_channel;
/* If select() times out, the request for the device with handle g_min_timeout_fd is aborted */ /* If select() times out, the request for the device with handle g_min_timeout_fd is aborted */
@ -814,14 +814,21 @@ rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * t
iorq = g_iorequest; iorq = g_iorequest;
while (iorq != NULL) while (iorq != NULL)
{ {
/* We need to test that the fd is still valid */ if (iorq->fd != 0)
if ((iorq->fd != 0) && (read(iorq->fd, &c, 0) == 0))
{ {
switch (iorq->major) switch (iorq->major)
{ {
case IRP_MJ_READ: case IRP_MJ_READ:
/* Is this FD valid? FDs will
be invalid when
reconnecting. FIXME: Real
support for reconnects. */
if (read(iorq->fd, &c, 0) != 0)
break;
FD_SET(iorq->fd, rfds); FD_SET(iorq->fd, rfds);
*n = MAX(*n, iorq->fd);
// Check if io request timeout is smaller than current (but not 0). // Check if io request timeout is smaller than current (but not 0).
if (iorq->timeout if (iorq->timeout
@ -835,14 +842,20 @@ rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * t
tv->tv_usec = (select_timeout % 1000) * 1000; tv->tv_usec = (select_timeout % 1000) * 1000;
*timeout = True; *timeout = True;
} }
break; break;
case IRP_MJ_WRITE: case IRP_MJ_WRITE:
/* FD still valid? See above. */
if (write(iorq->fd, &c, 0) != 0)
break;
FD_SET(iorq->fd, wfds); FD_SET(iorq->fd, wfds);
*n = MAX(*n, iorq->fd);
break; break;
} }
*n = MAX(*n, iorq->fd);
} }
iorq = iorq->next; iorq = iorq->next;