mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
scd,w32: Fix posssible lockup due to lost select results.
* scd/scdaemon.c (handle_connections) [W32]: Do not continue the loop
when an event was encountered.
--
Here the event handle is passed to npth_eselect so that this function
can detect the event and reset the event. There is no need to consume
this information here. However, npth_select might also got a ready
file descriptor along with the event and by doing a "continue" we
would miss the ready state of the file descriptor. The fix is to do
nothing here, similar to what we do in gpg-agent.
Fixes-commit: f9acc7d18b
GnuPG-bug-id: 2982
This commit is contained in:
parent
95a11baaa2
commit
a7ec3792c5
1 changed files with 5 additions and 2 deletions
|
@ -1394,8 +1394,11 @@ handle_connections (gnupg_fd_t listen_fd)
|
|||
ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, t,
|
||||
events, &events_set);
|
||||
saved_errno = errno;
|
||||
if (events_set & 1)
|
||||
continue;
|
||||
if ((events_set & 1))
|
||||
{
|
||||
if (opt.debug)
|
||||
log_debug ("the_event seen and reset by npth_eselect\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
if (ret == -1 && saved_errno != EINTR)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue