Skip to content

[fix] Socket: Fix stale read/write indexes in `_hx_std_socket_poll_ev… #1251

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

Closed
dimensionscape wants to merge 1 commit into from
Closed

[fix] Socket: Fix stale read/write indexes in `_hx_std_socket_poll_ev… #1251

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
104 changes: 56 additions & 48 deletions src/hx/libs/std/Socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,62 +1224,70 @@ Array<Dynamic> _hx_std_socket_poll_prepare( Dynamic pdata, Array<Dynamic> rsocks
Update the read/write flags arrays that were created with [socket_poll_prepare].
</doc>
**/
void _hx_std_socket_poll_events( Dynamic pdata, double timeout )
void _hx_std_socket_poll_events(Dynamic pdata, double timeout)
{
polldata *p = val_poll(pdata);

#ifdef NEKO_WINDOWS
memcpy(p->outr,p->fdr,FDSIZE(p->fdr->fd_count));
memcpy(p->outw,p->fdw,FDSIZE(p->fdw->fd_count));
polldata *p = val_poll(pdata);

struct timeval t;
struct timeval *tt = init_timeval(timeout,&t);
// Clear at entry so any early return leaves a clean -1 sentinel.
p->ridx[0] = -1;
p->widx[0] = -1;

hx::EnterGCFreeZone();
if( select(0/* Ignored */, p->fdr->fd_count ? p->outr : 0, p->fdw->fd_count ?p->outw : 0,NULL,tt) == SOCKET_ERROR )
{
hx::ExitGCFreeZone();
return;
}
hx::ExitGCFreeZone();
#ifdef NEKO_WINDOWS
memcpy(p->outr, p->fdr, FDSIZE(p->fdr->fd_count));
memcpy(p->outw, p->fdw, FDSIZE(p->fdw->fd_count));

int k = 0;
for(int i=0;i<p->fdr->fd_count;i++)
if( FD_ISSET(p->fdr->fd_array[i],p->outr) )
p->ridx[k++] = i;
p->ridx[k] = -1;
struct timeval t;
struct timeval *tt = init_timeval(timeout, &t);

k = 0;
for(int i=0;i<p->fdw->fd_count;i++)
if( FD_ISSET(p->fdw->fd_array[i],p->outw) )
p->widx[k++] = i;
p->widx[k] = -1;
hx::EnterGCFreeZone();
if (select(0, p->fdr->fd_count ? p->outr : 0,
p->fdw->fd_count ? p->outw : 0,
NULL, tt) == SOCKET_ERROR)
{
hx::ExitGCFreeZone();
// ridx/widx already set to -1 at entry
return;
}
hx::ExitGCFreeZone();

#else
int k = 0;
for (int i=0; i<p->fdr->fd_count; i++)
if (FD_ISSET(p->fdr->fd_array[i], p->outr))
p->ridx[k++] = i;
p->ridx[k] = -1;

int tot = p->rcount + p->wcount;
hx::EnterGCFreeZone();
POSIX_LABEL(poll_events_again);
if( poll(p->fds,tot,(int)(timeout * 1000)) < 0 )
{
HANDLE_EINTR(poll_events_again);
hx::ExitGCFreeZone();
return;
}
hx::ExitGCFreeZone();
k = 0;
for (int i=0; i<p->fdw->fd_count; i++)
if (FD_ISSET(p->fdw->fd_array[i], p->outw))
p->widx[k++] = i;
p->widx[k] = -1;

int k = 0;
int i = 0;
for(i=0;i<p->rcount;i++)
if( p->fds[i].revents & (POLLIN|POLLHUP) )
p->ridx[k++] = i;
p->ridx[k] = -1;
k = 0;
for(;i<tot;i++)
if( p->fds[i].revents & (POLLOUT|POLLHUP) )
p->widx[k++] = i - p->rcount;
p->widx[k] = -1;
#endif
#else
int tot = p->rcount + p->wcount;
hx::EnterGCFreeZone();
poll_events_again:
if (poll(p->fds, tot, (int)(timeout * 1000)) < 0)
{
if (errno == EINTR) goto poll_events_again;
hx::ExitGCFreeZone();
// ridx/widx already set to -1 at entry
return;
}
hx::ExitGCFreeZone();

int k = 0;
int i = 0;
for (i=0; i<p->rcount; i++)
if (p->fds[i].revents & (POLLIN | POLLHUP))
p->ridx[k++] = i;
p->ridx[k] = -1;

k = 0;
for (; i<tot; i++)
if (p->fds[i].revents & (POLLOUT | POLLHUP))
p->widx[k++] = i - p->rcount;
p->widx[k] = -1;
#endif
}


Expand Down
Loading