[FFmpeg-devel] [PATCH v2] libavcodec/pthread_frame: fix crash that call method ff_frame_thread_init failed because of mem insufficient

[javashu2012 at gmail.com]

From: bevis <javashu2012 at gmail.com>

  Start planning to submit in two, This is my complete modification. 

Signed-off-by: bevis <javashu2012 at gmail.com>
---
 libavcodec/pthread_frame.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index f8a01ad8cd..3331fa0f6f 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -687,7 +687,7 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
             pthread_join(p->thread, NULL);
         p->thread_init=0;
 
-        if (codec->close && p->avctx)
+        if (codec->close && p->avctx && p->avctx->priv_data)
             codec->close(p->avctx);
 
         release_delayed_buffers(p);
@@ -795,6 +795,11 @@ int ff_frame_thread_init(AVCodecContext *avctx)
         pthread_cond_init(&p->progress_cond, NULL);
         pthread_cond_init(&p->output_cond, NULL);
 
+        if (!copy) {
+            err = AVERROR(ENOMEM);
+            goto error;
+        }
+
         p->frame = av_frame_alloc();
         if (!p->frame) {
             av_freep(&copy);
@@ -802,22 +807,18 @@ int ff_frame_thread_init(AVCodecContext *avctx)
             goto error;
         }
 
-        p->parent = fctx;
-        p->avctx  = copy;
-
-        if (!copy) {
+        AVCodecInternal *internal = av_malloc(sizeof(AVCodecInternal));
+        if (!internal) {
+            av_freep(&copy);
             err = AVERROR(ENOMEM);
             goto error;
         }
 
-        *copy = *src;
+        p->parent = fctx;
+        p->avctx  = copy;
 
-        copy->internal = av_malloc(sizeof(AVCodecInternal));
-        if (!copy->internal) {
-            copy->priv_data = NULL;
-            err = AVERROR(ENOMEM);
-            goto error;
-        }
+        *copy = *src;
+        copy->internal = internal;
         *copy->internal = *src->internal;
         copy->internal->thread_ctx = p;
         copy->internal->last_pkt_props = &p->avpkt;
-- 
2.21.1 (Apple Git-122.3)