debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtexec: fix a case on linux where an infinite loop could occur.

Browse Source
This commit is contained in:
Jon Trulson
2013-12-29 15:00:16 -07:00
parent 2fc37b0f45
commit 90baa59dc1
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cde/programs/dtexec/Main.c
View File

@@ -1295,6 +1295,20 @@ main (
COPYBITS(allactivefdsG, readfds); COPYBITS(allactivefdsG, readfds);
COPYBITS(allactivefdsG, exceptfds); COPYBITS(allactivefdsG, exceptfds);
#if defined(linux)
/* JET 9/1/98 - linux select will actually modify the timeout struct -
* if a select exits early then the timeout struct will contain the
* amount remaining. When this gets to 0,0, an infinite loop
* will occur. So... setup the timeouts each iteration.
*/
timeoutShort.tv_sec = 0; /* in quick rediscovery mode */
timeoutShort.tv_usec = SHORT_SELECT_TIMEOUT;
timeoutLong.tv_sec = 86400; /* don't thrash on rediscovery */
timeoutLong.tv_usec = 0;
#endif
if (rediscoverSigCldG || rediscoverUrgentSigG) { if (rediscoverSigCldG || rediscoverUrgentSigG) {
nfound =select(MAXSOCKS, FD_SET_CAST(&readfds), FD_SET_CAST(NULL), nfound =select(MAXSOCKS, FD_SET_CAST(&readfds), FD_SET_CAST(NULL),
FD_SET_CAST(&exceptfds), &timeoutShort); FD_SET_CAST(&exceptfds), &timeoutShort);