From abc6614608021f967228856bd30e95c12afc1b8b Mon Sep 17 00:00:00 2001 From: Niklas Therning Date: Wed, 23 Nov 2016 14:57:45 +0100 Subject: [PATCH] Fix assert in poll_event_wait() on WSAENOTSOCK on Windows #2 PR #3998 fixes an error handling issue in poll_event_wait(). This new change fixes a minor code style problem in that PR, the condition in a ternary wasn't enclosed in parentheses. --- mono/metadata/socket-io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c index 2e04a8e3dab..142c3c53ff2 100644 --- a/mono/metadata/socket-io.c +++ b/mono/metadata/socket-io.c @@ -1242,7 +1242,7 @@ ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode, if (ret == -1) { #ifdef HOST_WIN32 - *werror = errno > 0 && errno < WSABASEERR ? errno + WSABASEERR : errno; + *werror = (errno > 0 && errno < WSABASEERR) ? errno + WSABASEERR : errno; #else *werror = errno_to_WSA (errno, __func__); #endif @@ -1868,7 +1868,7 @@ ves_icall_System_Net_Sockets_Socket_Select_internal (MonoArray **sockets, gint32 if (ret == -1) { #ifdef HOST_WIN32 - *werror = errno > 0 && errno < WSABASEERR ? errno + WSABASEERR : errno; + *werror = (errno > 0 && errno < WSABASEERR) ? errno + WSABASEERR : errno; #else *werror = errno_to_WSA (errno, __func__); #endif -- 2.25.1