From patchwork Thu Aug 12 20:03:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 29490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp148917iov; Thu, 12 Aug 2021 13:04:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsXCWUEvc47SleMlNBFNACN1YA07a17PhAFlhx3roEPVlx9mAkjh/lLC1JbQQQfeOrzHGK X-Received: by 2002:a05:6402:4246:: with SMTP id g6mr7528498edb.95.1628798690786; Thu, 12 Aug 2021 13:04:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628798690; cv=none; d=google.com; s=arc-20160816; b=dIobrQ2zHO4l/2xpjrxe0Sf62RMlcPBLzIiMJHoYsCHJpE6rye/NbN1pEtKi5PMXJ4 Afl83f5t0Evj85W5WxO/zMpoRybshFjaEaGqpKTQrpnUZzi8MJqFFMj9DcUPfB7Is1J2 5bfsj0f60F3fe/56CKpI70e+TQs9CCBjVgjgVrpPEf9uSYr7EJSl46KFQPvR0Xxzf2/t LEOMllEwPauUVblxAn/Ww7wFN+KOcj/nwpgrUQJJ4pJ18KOM+39InStPPO7/jEIwMrEW 9sdV/z6yFhKTx5/Mk7Tm5MNgOmhmdCThEB/t0L8T4cQleEi6WqxKOSIDZTq0lBBiePLW M9Cg== 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=uaKNbUW3KXnQxnvcniAQLif4xa3PwBOo00ghZWZwY4A=; b=zGNVpVOb91tNaePzMCQ1xo4NBjugPl746i1yrt2MBQtONw7peeYV1dZgnAAe71qxRr ZGR94N/NzwBpfXJwGCnwTk4veWzzzhTmdBD3Z7HlDdjKegIeNgR4mYecwFJevkbKCsW3 k+kLD202E45/JDcX9VFDX7VhuHHod2U6N6EzoRJvm/jAutn9szXotU42Hh/JA8aFdsnP BfU4Ib+Lza74J2uNlTBDICoJ6oiWENvocUgDDAR6H9bGNK2yNW215uQ1mWUZA3+kSJRq AwuZ6IGlcpmtnhxRWwZwHdUEdSxDw8pfAdso2ZdUe/K0byxF00D2S2FxXE2q3BgH8zx5 fDJQ== 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 di5si655359ejc.672.2021.08.12.13.04.50; Thu, 12 Aug 2021 13:04:50 -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 01E3B68A278; Thu, 12 Aug 2021 23:04:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85926689963 for ; Thu, 12 Aug 2021 23:04:39 +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 1mEGwR-00Gx5x-0B for ffmpeg-devel@ffmpeg.org; Thu, 12 Aug 2021 22:04:39 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id EGvTm9pXGljeHEGvTmUJrJ; Thu, 12 Aug 2021 22:03:39 +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=PZeI36DOe00GBnZbZf4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 12 Aug 2021 22:03:39 +0200 Message-Id: <20210812200339.13903-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfIRc9y6ZcQzHXJcHQQ4wzyUnXfxORkUCovBc87C6Sd2Csg42tth6pN9JcaR9NEQBlW9o0KsUMQPE6TPx/9Cx593l0s2tl+1d07avQqz/C8nmaHbtw9Zx o+k3ICPXksxE7UYGxT3KMV5IV5okCAnQbhyQ4tLNkNKuuqop8nggKINO Subject: [FFmpeg-devel] [PATCH] 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: a7n+2OMkhx6+ Fixes: MemLeak Fixes: 8281 Fixes: PoC_option158.jpg Fixes: CVE-2020-22037 Signed-off-by: Michael Niedermayer --- libavcodec/frame_thread_encoder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 9cabfc495f..4a56fedc9d 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)) @@ -198,11 +198,10 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) !(c->tasks[i].outdata = av_packet_alloc())) goto fail; } - 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; @@ -225,6 +224,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) av_assert0(!thread_avctx->internal->frame_thread_encoder); thread_avctx->internal->frame_thread_encoder = c; if(pthread_create(&c->worker[i], NULL, worker, thread_avctx)) { + avcodec_close(thread_avctx); goto fail; } } @@ -233,6 +233,7 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx) return 0; fail: + 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);