pthread: Check memory allocation

0994e142 · Vittorio Giovara · Luca Barbato · 03927cb7 · 0994e142
Commit 0994e142 authored May 31, 2015 by Vittorio Giovara Committed by Luca Barbato May 31, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

pthread_frame.c libavcodec/pthread_frame.c +7 -0

No files found.
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -584,8 +584,15 @@ int ff_frame_thread_init(AVCodecContext *avctx)
    }

    avctx->internal->thread_ctx = fctx = av_mallocz(sizeof(FrameThreadContext));
+    if (!fctx)
+        return AVERROR(ENOMEM);

    fctx->threads = av_mallocz(sizeof(PerThreadContext) * thread_count);
+    if (!fctx->threads) {
+        av_freep(&avctx->internal->thread_ctx);
+        return AVERROR(ENOMEM);
+    }
+
    pthread_mutex_init(&fctx->buffer_mutex, NULL);
    fctx->delaying = 1;