virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

udp: fix segfault on closing

Browse Source 
Fixes ticket915
This commit is contained in:
Laurent BRULET 2012-01-14 17:14:18 +01:00 committed by Michael Niedermayer
parent 633606c905
commit 45c39e566f
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libavformat/udp.c
View File

@ -71,6 +71,8 @@ typedef struct {
pthread_t circular_buffer_thread; pthread_t circular_buffer_thread;
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
int thread_started;
volatile int exit_thread;
#endif #endif
uint8_t tmp[UDP_MAX_PKT_SIZE+4]; uint8_t tmp[UDP_MAX_PKT_SIZE+4];
int remaining_in_dg; int remaining_in_dg;
@ -327,7 +329,7 @@ static void *circular_buffer_task( void *_URLContext)
fd_set rfds; fd_set rfds;
struct timeval tv; struct timeval tv;
for(;;) { while(!s->exit_thread) {
int left; int left;
int ret; int ret;
int len; int len;
@ -525,18 +527,36 @@ static int udp_open(URLContext *h, const char *uri, int flags)
#if HAVE_PTHREADS #if HAVE_PTHREADS
if (!is_output && s->circular_buffer_size) { if (!is_output && s->circular_buffer_size) {
int ret;
/* start the task going */ /* start the task going */
s->fifo = av_fifo_alloc(s->circular_buffer_size); s->fifo = av_fifo_alloc(s->circular_buffer_size);
pthread_mutex_init(&s->mutex, NULL); ret = pthread_mutex_init(&s->mutex, NULL);
pthread_cond_init(&s->cond, NULL); if (ret != 0) {
if (pthread_create(&s->circular_buffer_thread, NULL, circular_buffer_task, h)) { av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret));
av_log(h, AV_LOG_ERROR, "pthread_create failed\n");
goto fail; goto fail;
} }
ret = pthread_cond_init(&s->cond, NULL);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", strerror(ret));
goto cond_fail;
}
ret = pthread_create(&s->circular_buffer_thread, NULL, circular_buffer_task, h);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "pthread_create failed : %s\n", strerror(ret));
goto thread_fail;
}
s->thread_started = 1;
} }
#endif #endif
return 0; return 0;
#if HAVE_PTHREADS
thread_fail:
pthread_cond_destroy(&s->cond);
cond_fail:
pthread_mutex_destroy(&s->mutex);
#endif
fail: fail:
if (udp_fd >= 0) if (udp_fd >= 0)
closesocket(udp_fd); closesocket(udp_fd);
@ -617,12 +637,20 @@ static int udp_write(URLContext *h, const uint8_t *buf, int size)
static int udp_close(URLContext *h) static int udp_close(URLContext *h)
{ {
UDPContext *s = h->priv_data; UDPContext *s = h->priv_data;
int ret;
if (s->is_multicast && (h->flags & AVIO_FLAG_READ)) if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr); udp_leave_multicast_group(s->udp_fd, (struct sockaddr *)&s->dest_addr);
closesocket(s->udp_fd); closesocket(s->udp_fd);
av_fifo_free(s->fifo); av_fifo_free(s->fifo);
#if HAVE_PTHREADS #if HAVE_PTHREADS
if (s->thread_started) {
s->exit_thread = 1;
ret = pthread_join(s->circular_buffer_thread, NULL);
if (ret != 0)
av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", strerror(ret));
}
pthread_mutex_destroy(&s->mutex); pthread_mutex_destroy(&s->mutex);
pthread_cond_destroy(&s->cond); pthread_cond_destroy(&s->cond);
#endif #endif