diff options
| author | Marton Balint <cus@passwd.hu> | 2020-01-26 22:13:50 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-02-02 19:04:42 +0100 |
| commit | 53aa76686e7ff4f1f6625502503d7923cec8c10e (patch) | |
| tree | 43fd5c63b3574aa438625828c9145097615a36ca /libavformat/udp.c | |
| parent | c2b6493bf7ccbd34c2b28c53093fa6902673a8cd (diff) | |
| download | ffmpeg-53aa76686e7ff4f1f6625502503d7923cec8c10e.tar.gz | |
avformat/udp: cancel pending IO on win32 manually
recvfrom() is not a cancellation point in pthreads-win32, see
https://sourceware.org/pthreads-win32/manual/pthread_cancel.html
In order to be able to cancel the reader thread on Win32 properly we first
shutdown the socket then call CancelIoEx to abort pending IO. Subsequent
recvfrom() calls will fail with WSAESHUTDOWN causing the thread to exit.
Fixes ticket #5717.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/udp.c')
| -rw-r--r-- | libavformat/udp.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c index 85c9e3a900..23c3773c64 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -1069,8 +1069,17 @@ static int udp_close(URLContext *h) if (s->thread_started) { int ret; // Cancel only read, as write has been signaled as success to the user - if (h->flags & AVIO_FLAG_READ) + if (h->flags & AVIO_FLAG_READ) { +#ifdef _WIN32 + /* recvfrom() is not a cancellation point for win32, so we shutdown + * the socket and abort pending IO, subsequent recvfrom() calls + * will fail with WSAESHUTDOWN causing the thread to exit. */ + shutdown(s->udp_fd, SD_RECEIVE); + CancelIoEx((HANDLE)(SOCKET)s->udp_fd, NULL); +#else pthread_cancel(s->circular_buffer_thread); +#endif + } ret = pthread_join(s->circular_buffer_thread, NULL); if (ret != 0) av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", strerror(ret)); |