Module: libav Branch: master Commit: a8fe9a7242cfc7351957c0ec086d0722b2a653da
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Wed Nov 16 17:30:28 2011 -0500 pthread: add some malloc failure checks --- libavcodec/pthread.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 9fe9b8d..42b82a5 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -719,6 +719,11 @@ static int frame_thread_init(AVCodecContext *avctx) p->parent = fctx; p->avctx = copy; + if (!copy) { + err = AVERROR(ENOMEM); + goto error; + } + *copy = *src; copy->thread_opaque = p; copy->pkt = &p->avpkt; @@ -732,6 +737,10 @@ static int frame_thread_init(AVCodecContext *avctx) update_context_from_thread(avctx, copy, 1); } else { copy->priv_data = av_malloc(codec->priv_data_size); + if (!copy->priv_data) { + err = AVERROR(ENOMEM); + goto error; + } memcpy(copy->priv_data, src->priv_data, codec->priv_data_size); copy->internal = av_malloc(sizeof(AVCodecInternal)); if (!copy->internal) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
