Commit e20e9b90 authored by Marton Balint's avatar Marton Balint

lavf/fifo: fix undefined behaviour in deinit when destroying mutex

Reviewed-by: 's avatarJan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent d318e060
...@@ -73,6 +73,7 @@ typedef struct FifoContext { ...@@ -73,6 +73,7 @@ typedef struct FifoContext {
int restart_with_keyframe; int restart_with_keyframe;
pthread_mutex_t overflow_flag_lock; pthread_mutex_t overflow_flag_lock;
int overflow_flag_lock_initialized;
/* Value > 0 signals queue overflow */ /* Value > 0 signals queue overflow */
volatile uint8_t overflow_flag; volatile uint8_t overflow_flag;
...@@ -515,6 +516,7 @@ static int fifo_init(AVFormatContext *avf) ...@@ -515,6 +516,7 @@ static int fifo_init(AVFormatContext *avf)
ret = pthread_mutex_init(&fifo->overflow_flag_lock, NULL); ret = pthread_mutex_init(&fifo->overflow_flag_lock, NULL);
if (ret < 0) if (ret < 0)
return AVERROR(ret); return AVERROR(ret);
fifo->overflow_flag_lock_initialized = 1;
return 0; return 0;
} }
...@@ -601,6 +603,7 @@ static void fifo_deinit(AVFormatContext *avf) ...@@ -601,6 +603,7 @@ static void fifo_deinit(AVFormatContext *avf)
av_dict_free(&fifo->format_options); av_dict_free(&fifo->format_options);
avformat_free_context(fifo->avf); avformat_free_context(fifo->avf);
av_thread_message_queue_free(&fifo->queue); av_thread_message_queue_free(&fifo->queue);
if (fifo->overflow_flag_lock_initialized)
pthread_mutex_destroy(&fifo->overflow_flag_lock); pthread_mutex_destroy(&fifo->overflow_flag_lock);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment