From patchwork Fri Oct 16 07:50:14 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: 23000 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 8131C44B760 for ; Fri, 16 Oct 2020 11:13:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 647CE68BA86; Fri, 16 Oct 2020 11:13:18 +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 2E02C68B641 for ; Fri, 16 Oct 2020 11:13:11 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id e10so1052149pfj.1 for ; Fri, 16 Oct 2020 01:13:11 -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=qsUeIFDwlu1wczuVY8oaiurYdcXzTvldZaIp9tsZdAA=; b=CMe+5S2muWdIR4KWkvn9fltZuu+j8I4YDae/v8wrIGMmA+JFSx4PUP6JUmfHrhTXQC GOua5qMzQu+JygUlOKJd8aLj7MM1HA2MT9Qk3uKSw0p7JgS2aKD61VzTwDJno8PjOz7a raOO+C3Gmp+99JhfyMSUW5xxiVtZ7etLfP41jJUvcWkxx7uknFx1EoBkP6i3UJy0eYzV 6nYQbRgWmcS8L+RK1lPEMmehFxZz/dPZVf9/mQLBHj0oIzydsG07P+YSwatm42Xn1id/ 52ZaBm3XIweZHJXAz8j27NZTvkrDEYrdXjJ/4z+4Waz3lwD+ZPMSIfAtnQoJ4BH0gTpH azBA== 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=qsUeIFDwlu1wczuVY8oaiurYdcXzTvldZaIp9tsZdAA=; b=B8vS5tdv6MquwOSkQU4ZOPCkprnG8RDkG+KGBv+L9devd7kE/m/+zMS2Se2ewoERi/ brHWMyaQ0DLQ4eVITH+CYI5wTljo4tRVwTza0YemgXTF8vkYh61b+1tjWwIa/6PENltf PXWWYt0iUQH854qOl8JujFnLnaZP6TXN3hrvuUwAd2X/mjtqfWL84wyj6WLB0DXgzf8h PAcjE3uMCyQqQafpZrn5Zo3Pdjxru0s86P3WTTHW7v67r93PNtwSTYCt1hHouCDy232Y QfTyVqKc9TfPfL8uIGKOZ+zpJIvMKZzHG35qegiJgkFtgt1SCCA9lsUqdwXNu7wk4Xom p9oQ== X-Gm-Message-State: AOAM531oor0ouBRYeTLDxKoXRYBEZXeWc3AzD/LT83NWWj0PM3OIibex h6zbEIeXnvrv7thDvHnSZmi+y+T3WYk= X-Google-Smtp-Source: ABdhPJyRWuXzSdGc6gxI+h5iQz3MGKY6f62nE29GlwqZzqEypgeWrb/sLJT6X0BOU063gkemOIcDrQ== X-Received: by 2002:a63:5a11:: with SMTP id o17mr1985562pgb.287.1602834635980; Fri, 16 Oct 2020 00:50:35 -0700 (PDT) Received: from localhost.localdomain ([47.89.83.18]) by smtp.gmail.com with ESMTPSA id 8sm1775521pge.7.2020.10.16.00.50.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2020 00:50:35 -0700 (PDT) From: javashu2012@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Oct 2020 15:50:14 +0800 Message-Id: <20201016075014.58965-1-javashu2012@gmail.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] 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: xuhuishu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: xuhuishu Signed-off-by: xuhuishu --- libavcodec/pthread_frame.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index f8a01ad8cd..2babeb4a6a 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -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;