From patchwork Fri Oct 16 12:13:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5b6Q5oWn5Lmm?= X-Patchwork-Id: 23010 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9D5B844BC0E for ; Fri, 16 Oct 2020 15:13:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85B2768B9C9; Fri, 16 Oct 2020 15:13:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E273368B9A1 for ; Fri, 16 Oct 2020 15:13:16 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id n14so1394666pff.6 for ; Fri, 16 Oct 2020 05:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=e4PXgQCxi8xHRgkF4cxL2i7iSZeUEMqgkhqcpPwMX9w=; b=gFdfw798HHrtiiwYY6YK4uPR3wB5jsb02NWEqY30DipPYTjv+HQ2nG9EEHEGo4oi8y 4umiuzZsxxXwW6YaJWhXc1jVjpIkLe2+uGwos9jAZMRevTKIm9i+aHObdu4MIiOTAXC2 IiXj/dIQ10NsLRpFZqXZev84Exv7Aw6qIhgUCfdOLT0S15KmWxIjDAVzMDv/xKqT/sHb jtcs1ReUlfVq+tWgK4qpZWclBNHil536fOhGmKmLYAlIiJFm5s76Y1AaihYb//Ps0IkO D1bm1I4OHkzjzMFGlvgGDxIuGe1IGw/0grOODMYRR+B0VSpD9t9s1p8e/069nUPyvcTn QMRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=e4PXgQCxi8xHRgkF4cxL2i7iSZeUEMqgkhqcpPwMX9w=; b=Sh1BtP08HWMfEzapPhfuiMAbO1XJOo3czisrGHprdodXFZ+/fT1yARAFJiyEmUul4T 54j7pPTlmlkUHM9jYCk0RKNNwxgTuxrEpZHsASsNSb13inpkWTyIcMxK+btIwDtFHwiA zKKcqMUaQGh2W/EkWzA2wBMJrAbnpVNjHeEe5e8fZRDYiYw9y+JLVT872PqMUpBigIpo OPdNgQR/Fit663gT8zLe9aAX+zJxfZQI4UEVZrusWgfjqTJ5wjMQ4pgkm4n9hRfNnCaS vGT5cSM+fDENhY19nqrdMHtczRu1gQLhOlzgSmGg3cjdEIdKcN2tfLmJRzl+y1JaIRNT IokQ== X-Gm-Message-State: AOAM532tp6D1y5TWEtCOQiJclR8Z4PwVxY1KswQFjUgCqC/Q3Nyh8d2m h5vfszLmnt2RdZv0Pkg2d/KL3FUJ+rk= X-Google-Smtp-Source: ABdhPJxlWa/qJlfDraUVPoxgQ2SB32/L0GyvGI9VdflwK5oUcp+hyV8xwPI9JdYXKFHFvPFcstfEjA== X-Received: by 2002:a05:6a00:22d5:b029:155:c72b:50ce with SMTP id f21-20020a056a0022d5b0290155c72b50cemr3558037pfj.65.1602850394787; Fri, 16 Oct 2020 05:13:14 -0700 (PDT) Received: from localhost.localdomain ([47.89.83.18]) by smtp.gmail.com with ESMTPSA id y16sm3111662pfb.154.2020.10.16.05.13.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2020 05:13:14 -0700 (PDT) From: javashu2012@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Oct 2020 20:13:03 +0800 Message-Id: <20201016121303.68191-1-javashu2012@gmail.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/pthread_frame: fix crash that call method ff_frame_thread_init failed because of mem insufficient X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: bevis Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: bevis Start planning to submit in two, This is my complete modification. Signed-off-by: bevis --- 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(©); @@ -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(©); 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;