From patchwork Sat Aug 14 07:55:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29500 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp263286iov; Sat, 14 Aug 2021 00:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNc/hac7i9dUuQqN/0zpJ4oFx239DEIvDRY/ikXGXZECC0Giu47F6TMjLh069JTD1xAW82 X-Received: by 2002:a17:906:4dd5:: with SMTP id f21mr6469372ejw.284.1628927771517; Sat, 14 Aug 2021 00:56:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628927771; cv=none; d=google.com; s=arc-20160816; b=oW6XBbeGL0HYHSe013NR2T+NVfsiYRFV0cVdqIfDuTXkxsonbHvQbCwBnY+FAKPhuC 3i3TIYiu3wtiE6Ceqc1TiGxmUUddcjM32rKhLRrvpKFly+6RvohnyGjEoalEdI3iR57N 0ZsncNXdaEii1h4B6/FtXB2HKRZQb8fMwe8y8yElFh8lX+7IXtVWo1fYN7JyEk1xC/CA nzdpZEuCquK0c/ebQB/uOTrfUoIb87AG4bLNQ0yl69x9U+DsbSuAf3y/dS6OcM9hp6p1 i0Tw2yrIy8REh4fttaVhvCY+klIRnLhD5LfQg3ZZ+aMOeTIbq/glYnb5aKfJhbusmhq0 4nqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=78P5warzOo6Fyz+VIHdmtj0VOIoHDHEW5QWETW7DHnU=; b=j697wlTEbjbR+CVrRdgH1WIEJquh+MkvJaujwSKmPDNh0UZMVG3qjLTEjUUeMsfbiS gDCMryFWijEtJBdLrXJUU8XMBBUaN1AdUuekYSsFLj8f7hEiO/ORiLl62cvIFxqoDv3e 42XvIEzRC8vCF4/kH01q4OFrgi8tcFIoWNNFk0+ho+Jk0iDWLEhipJebMjYL6RhNnsUC x29p2ZT0QeDgKqHg90HHEW5cMs0PJZFF1NvgYnGrDY0K5X6vnP1lfZBgGdvzFWKi5SI0 WaQjJ0e62nO9WnXqz0GQu6hszUu+LehHeP2pW6DPClhRFKXxphcjSOenfbqgSIIWDvtc vgeg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y10si1213491eju.240.2021.08.14.00.56.10; Sat, 14 Aug 2021 00:56:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C26AC68A4C3; Sat, 14 Aug 2021 10:56:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (unknown [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A19D168A2D1 for ; Sat, 14 Aug 2021 10:56:00 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mEoWO-005zbt-1H for ffmpeg-devel@ffmpeg.org; Sat, 14 Aug 2021 09:56:00 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id EoVQmovlEljeHEoVQmj8Go; Sat, 14 Aug 2021 09:55:00 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=3X9KK99_qLYsd_4OHloA:9 a=0bXxn9q0MV6snEgNplNhOjQmxlI=:19 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 14 Aug 2021 09:55:00 +0200 Message-Id: <20210814075500.29399-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfPolszmjJG7kgvKS3klGCSuLwFdt7SaJvDQ0a5SUuoGZAvLZ1Iid0mWpGtBfBpUJOt6kO7Uf6054WUt1Jrv3ynZ1Rp8lGtGcIWZKsibBR3Gno1ttX3dI GKY8YZgpBAzmAgIUvIFUN3uZ9GLnO+fwwwaWXvBtqzQA/58CfXkYfOf0 Subject: [FFmpeg-devel] [PATCH v3] avcodec/frame_thread_encoder: Free AVCodecContext structure on error during init X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4pUOHfMWtuad Fixes: MemLeak Fixes: 8281 Fixes: PoC_option158.jpg Fixes: CVE-2020-22037 Signed-off-by: Michael Niedermayer --- libavcodec/frame_thread_encoder.c | 11 +++++++---- libavcodec/frame_thread_encoder.h | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 9cabfc495f..9bc48c7761 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -126,7 +126,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) { int i=0; ThreadContext *c; - + AVCodecContext *thread_avctx = NULL; if( !(avctx->thread_type & FF_THREAD_FRAME) || !(avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS)) @@ -202,16 +202,17 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) for(i=0; ithread_count ; i++){ int ret; void *tmpv; - AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec); + thread_avctx = avcodec_alloc_context3(avctx->codec); if(!thread_avctx) goto fail; tmpv = thread_avctx->priv_data; *thread_avctx = *avctx; + thread_avctx->priv_data = tmpv; + thread_avctx->internal = NULL; + thread_avctx->hw_frames_ctx = NULL; ret = av_opt_copy(thread_avctx, avctx); if (ret < 0) goto fail; - thread_avctx->priv_data = tmpv; - thread_avctx->internal = NULL; if (avctx->codec->priv_class) { int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data); if (ret < 0) @@ -233,6 +234,8 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) return 0; fail: + avcodec_close(thread_avctx); + av_freep(&thread_avctx); avctx->thread_count = i; av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n"); ff_frame_thread_encoder_free(avctx); diff --git a/libavcodec/frame_thread_encoder.h b/libavcodec/frame_thread_encoder.h index 2cdc40a830..201cba2a8f 100644 --- a/libavcodec/frame_thread_encoder.h +++ b/libavcodec/frame_thread_encoder.h @@ -23,6 +23,10 @@ #include "avcodec.h" +/** + * Initialize frame thread encoder. + * @note hardware encoders are not supported + */ int ff_frame_thread_encoder_init(AVCodecContext *avctx); void ff_frame_thread_encoder_free(AVCodecContext *avctx); int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt,