From a8fe9a7242cfc7351957c0ec086d0722b2a653da Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Wed, 16 Nov 2011 17:30:28 -0500
Subject: [PATCH] pthread: add some malloc failure checks

---
 libavcodec/pthread.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 9fe9b8d784..42b82a57d7 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) {