From patchwork Fri Oct 16 07:55:01 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: 23003 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 0B7764498A8 for ; Fri, 16 Oct 2020 11:58:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6B2868BBEB; Fri, 16 Oct 2020 11:58:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f66.google.com (mail-vs1-f66.google.com [209.85.217.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0972B68BA0E for ; Fri, 16 Oct 2020 11:58:35 +0300 (EEST) Received: by mail-vs1-f66.google.com with SMTP id u7so998758vsq.11 for ; Fri, 16 Oct 2020 01:58:34 -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=9xkQ2NTJ6L/AiEHUYqpaRgpK4vtL4a6T+A+v4xAHUaQ=; b=JYW+sf1MI6nZU+u1Y4udOZtS52eCuIXVe2ay3rxgQukS9VZwcCi2KPtTw7ns/KybCY 67Ed5r7Q3mpwNYgSO0QRKO6BT9tk1mY0jtFHpzPonFsBMNdAPNoYMi/qMc2ciqYU7dCR qExxq+mk1K4MMFLSbE6P0trVQXNt9aP0RgopAWkqyr8Y1MAbkO6jcEJUI8TEwTNkO3Gp 3sNwgMEQZhUA1d4u86+bZ+DGB1al7x0H11iRAHQ+IzkIGBmTOt9z2L3C5Wmv+zJMeZa6 qLFG2i+OsE/tLNFIb24+6ZH8Jr6dmfuuueq/K2DI7cfHCy5ZPLpSsrxStRj0Y+sqQu6C 3rOg== 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=9xkQ2NTJ6L/AiEHUYqpaRgpK4vtL4a6T+A+v4xAHUaQ=; b=KAbM8763kuFqdb+a6HRZI0eJix8Ij+aZXujyM6TiYnpfwmIWjXLXSbhhvoFDT1Pj3h fFgXkPV4x3XSIq6eZ6UsN80wK8nSVF9RTweEOUxRaZJcnSSTJ6JgKJRa/bdrwUGfck3V WyeKJtPTbmYJERW9OyXgHdPBaor0EEMhIe0exQlkWYnsk1yFbkhgYgpRWwYhDzluXUz9 qDfDRamABM8tDmrmJPY9PR5GM/fIjwyH6L9gJpPOr40YNT5lvZhd8T/yQwpY8SupB4ES uHzJ3HaQBuzWgrcD/v0v8mx4OxUCZJewRhTH2KRRx2sSszBcN2kmWUqz9n9aEPZa+oQQ tXvw== X-Gm-Message-State: AOAM532eySoIsnhkOssh8MLZdVZn5cLslNvsYnLdYFr08XahDtx2w44w qjJv54y+IRQtqs13HebN051SrlTWIHs= X-Google-Smtp-Source: ABdhPJwysgBrogAQwhVNV2UjwyYrmEQs+FabtZT8I2eDoigoR75Ui8l3eAolZ3BK4BOaI9/2d6a01w== X-Received: by 2002:a62:6c5:0:b029:158:d0b1:b283 with SMTP id 188-20020a6206c50000b0290158d0b1b283mr2435725pfg.79.1602834914364; Fri, 16 Oct 2020 00:55:14 -0700 (PDT) Received: from localhost.localdomain ([47.89.83.18]) by smtp.gmail.com with ESMTPSA id s66sm1781661pfb.25.2020.10.16.00.55.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Oct 2020 00:55:13 -0700 (PDT) From: javashu2012@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Oct 2020 15:55:01 +0800 Message-Id: <20201016075501.61565-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: bevis Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: bevis Signed-off-by: bevis --- 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;