Commit 72555f4a authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/pthread_slice: Check for malloc failure

Found-by: CSA
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 37ec7d29
......@@ -268,13 +268,16 @@ int ff_alloc_entries(AVCodecContext *avctx, int count)
p->thread_count = avctx->thread_count;
p->entries = av_mallocz_array(count, sizeof(int));
if (!p->entries) {
p->progress_mutex = av_malloc_array(p->thread_count, sizeof(pthread_mutex_t));
p->progress_cond = av_malloc_array(p->thread_count, sizeof(pthread_cond_t));
if (!p->entries || !p->progress_mutex || !p->progress_cond) {
av_freep(&p->entries);
av_freep(&p->progress_mutex);
av_freep(&p->progress_cond);
return AVERROR(ENOMEM);
}
p->entries_count = count;
p->progress_mutex = av_malloc_array(p->thread_count, sizeof(pthread_mutex_t));
p->progress_cond = av_malloc_array(p->thread_count, sizeof(pthread_cond_t));
for (i = 0; i < p->thread_count; i++) {
pthread_mutex_init(&p->progress_mutex[i], NULL);
......
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