From 3922f76ab57c8f471dd15151fe208fb525bb060b Mon Sep 17 00:00:00 2001 From: Elad Ashkenazi Date: Mon, 20 Feb 2023 10:59:40 +0200 Subject: [PATCH] PINE: Fix crash on exit (#13409) --- 3rdparty/pine/pine_server.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/3rdparty/pine/pine_server.h b/3rdparty/pine/pine_server.h index 8b6cbb8cd6..d801f77c2f 100644 --- a/3rdparty/pine/pine_server.h +++ b/3rdparty/pine/pine_server.h @@ -24,6 +24,7 @@ #define close_portable(a) (close(a)) #include #include +#include #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #include #endif @@ -354,6 +355,28 @@ namespace pine */ bool StartSocket() { + ::pollfd poll_fd{}; + + for (int pending_connection = 0; pending_connection != 1;) + { + if (thread_ctrl::state() == thread_state::aborting) + { + return false; + } + + std::memset(&poll_fd, 0, sizeof(poll_fd)); + poll_fd.events = POLLIN; + poll_fd.revents = 0; + poll_fd.fd = m_sock; + +#ifdef _WIN32 + // Try to wait for an incoming connection + pending_connection = ::WSAPoll(&poll_fd, 1, 10); +#else + pending_connection = ::poll(&poll_fd, 1, 10); +#endif + } + m_msgsock = accept(m_sock, 0, 0); if (m_msgsock == -1)