Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix assert in poll_event_wait() on WSAENOTSOCK on Windows #3998

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

Merged
ntherning merged 1 commit into from
Nov 22, 2016
Merged

Fix assert in poll_event_wait() on WSAENOTSOCK on Windows #3998

Show file tree
Hide file tree
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: 2 additions & 2 deletions mono/metadata/socket-io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode,

if (ret == -1) {
#ifdef HOST_WIN32
*werror = WSAGetLastError ();
*werror = errno > 0 && errno < WSABASEERR ? errno + WSABASEERR : errno;
#else
*werror = errno_to_WSA (errno, __func__);
#endif
Expand Down Expand Up @@ -1868,7 +1868,7 @@ ves_icall_System_Net_Sockets_Socket_Select_internal (MonoArray **sockets, gint32

if (ret == -1) {
#ifdef HOST_WIN32
*werror = WSAGetLastError ();
*werror = errno > 0 && errno < WSABASEERR ? errno + WSABASEERR : errno;
#else
*werror = errno_to_WSA (errno, __func__);
#endif
Expand Down
20 changes: 0 additions & 20 deletions mono/metadata/threadpool-ms-io-poll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ poll_mark_bad_fds (mono_pollfd *poll_fds, gint poll_fds_size)
ready++;
break;
case -1:
#if !defined(HOST_WIN32)
if (errno == EBADF)
#else
if (WSAGetLastError () == WSAEBADF)
#endif
{
poll_fds [i].revents |= MONO_POLLNVAL;
ready++;
Expand Down Expand Up @@ -163,37 +159,21 @@ poll_event_wait (void (*callback) (gint fd, gint events, gpointer user_data), gp
* ENOMEM: we're doomed anyway
*
*/
#if !defined(HOST_WIN32)
switch (errno)
#else
switch (WSAGetLastError ())
#endif
{
#if !defined(HOST_WIN32)
case EINTR:
#else
case WSAEINTR:
#endif
{
mono_thread_internal_check_for_interruption_critical (mono_thread_internal_current ());
ready = 0;
break;
}
#if !defined(HOST_WIN32)
case EBADF:
#else
case WSAEBADF:
#endif
{
ready = poll_mark_bad_fds (poll_fds, poll_fds_size);
break;
}
default:
#if !defined(HOST_WIN32)
g_error ("poll_event_wait: mono_poll () failed, error (%d) %s", errno, g_strerror (errno));
#else
g_error ("poll_event_wait: mono_poll () failed, error (%d)\n", WSAGetLastError ());
#endif
break;
}
}
Expand Down