Skip to content

libvncserver: handle EINTR #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libvncserver: handle EINTR #483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libvncserver/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,14 @@ clientInput(void *data)
tv.tv_sec = 60; /* 1 minute */
tv.tv_usec = 0;

retry:
n = select(nfds + 1, &rfds, &wfds, &efds, &tv);

if (n < 0) {
rfbLogPerror("ReadExact: select");
if (errno == EINTR) {
goto retry;
Copy link
Member

@bk138 bk138 Apr 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why wouldn't a simple continue work as in the other cases?

Copy link
Contributor

@antenore antenore Apr 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@piec the goto itself is not an issue, the problem is if the client disconnect.
In that case the FD will become invalid, but your retry will cut the check done some line before, and it will never finish till it'll probably crash.
So please try with the continue, I cannot reproduce the problem to test.

}
break;
}
if (n == 0) /* timeout */
Expand Down