From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9C7FA425A4 for ; Sun, 20 Mar 2022 23:29:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFDDE68B172; Mon, 21 Mar 2022 01:29:36 +0200 (EET) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FA3668B0F6 for ; Mon, 21 Mar 2022 01:29:30 +0200 (EET) Received: by mail-oi1-f179.google.com with SMTP id ay7so14689227oib.8 for ; Sun, 20 Mar 2022 16:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=gPe3yVM4pOA7bmkN+G+aGDhTOJdWSCDw+s4E/V3WhJM=; b=dKA2s0Cn/0ZFvjzViU8yOiZcLgCfrqsvEMad/evbWL05rHh9Vs1PAaGmyMypWll1kM ODGfSRh5gvLXIx99AP8UyNWZJhHV8Be4TbXI0B48vXacBJuIExkBVLZGlqLTu4/m9SwV P2mrUsHXSpitkV34/RXWQt1WLnOVAIkKRGv41aOID/AP6l869ghPg4v4IcJdsU9elLGv W9qjgduW/GEs/ZChapfctyxfzGVEAgFIpY1hf6Kh23iHmW4TRCSQVFmpxs21i45Qg1JQ zVqT/DgV8R1kAuoJkfz1ZCFFEvUv/QAtccgNFQkqNhXYPD9p8fb+RBztDOPfo6hedrRX JvBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=gPe3yVM4pOA7bmkN+G+aGDhTOJdWSCDw+s4E/V3WhJM=; b=3GchdUmLp7vpMQvQq4t+BulqlvC/5rLslDNBBL9Qh9nTuJ67TduLbv9DBlm6KV1fC+ oBGwvlmYDYZ6WWkXYxTyOUo1ZUILDL2SUSTr3r9YtT1WF9UcupkeAuIIdCkSW360TNNn AxbhpuBShM8UnmH1VopkY15CMNV4VlOcqpJqWSGNYufgn+arRCXRkJfbBoIMJPv3gOsg vujHHcW+kJOT7a2WGd4mgrXyju8tNFLMPHV6TxOmiC4/NCH6KmIBcV01u0GfKXWCExXp +VNDVFr6JSQQfLwAj1jUs355oH2vjXjn+3gRMBeGDYKRhP74+caDRGo5dp0VR8OQphsI vK9g== X-Gm-Message-State: AOAM533N+VLGcKpe7ENLMqav4D4wZ5bWKKzknmRxZwlg0o56dAKgEVuE KGAb7sMwi4drXqrZ0uE7uBs+DUY6DX70sg== X-Google-Smtp-Source: ABdhPJwMQ0a9gvvxY2rHM2dmfWZ66CyKsp5PQ7Arog1lN0g86LYPb79Z8dE/POgbJUPc3PdsjIMyrg== X-Received: by 2002:a05:6808:bc2:b0:2ec:e7f0:c11e with SMTP id o2-20020a0568080bc200b002ece7f0c11emr12884644oik.126.1647818968486; Sun, 20 Mar 2022 16:29:28 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id r18-20020a056830081200b005ad10dfcf60sm6695234ots.67.2022.03.20.16.29.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 20 Mar 2022 16:29:27 -0700 (PDT) Message-ID: <66b6e472-d8fd-f544-8256-e3b7aadb6bb3@gmail.com> Date: Sun, 20 Mar 2022 20:29:29 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220320231809.40398-1-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] avcodec/avcodec: don't free AVOption settable fields in avcodec_close() 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/20/2022 8:26 PM, Andreas Rheinhardt wrote: > James Almer: >> It can uninitialize fields that may still be used after the context was closed, >> so do it instead in avcodec_free_context(). >> >> Signed-off-by: James Almer >> --- >> libavcodec/avcodec.c | 1 - >> libavcodec/options.c | 2 +- >> 2 files changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c >> index 38bdaad4fa..122d09b63a 100644 >> --- a/libavcodec/avcodec.c >> +++ b/libavcodec/avcodec.c >> @@ -524,7 +524,6 @@ av_cold int avcodec_close(AVCodecContext *avctx) >> >> if (avctx->priv_data && avctx->codec && avctx->codec->priv_class) >> av_opt_free(avctx->priv_data); >> - av_opt_free(avctx); >> av_freep(&avctx->priv_data); >> if (av_codec_is_encoder(avctx->codec)) { >> av_freep(&avctx->extradata); >> diff --git a/libavcodec/options.c b/libavcodec/options.c >> index 33f11480a7..91335415c1 100644 >> --- a/libavcodec/options.c >> +++ b/libavcodec/options.c >> @@ -172,7 +172,7 @@ void avcodec_free_context(AVCodecContext **pavctx) >> av_freep(&avctx->intra_matrix); >> av_freep(&avctx->inter_matrix); >> av_freep(&avctx->rc_override); >> - av_channel_layout_uninit(&avctx->ch_layout); >> + av_opt_free(avctx); >> >> av_freep(pavctx); >> } > > This will lead to memleaks for users that use avcodec_close(avctx) + > av_free(avctx) to free an AVCodecContext (e.g. our frame-threaded > encoders do this). Notice that avcodec_free_context() violates the > documentation of AVCodecContext.extradata (documented to not be freed > for decoders) and AVCodecContext.subtitle_header and > AVCodecContext.rc_override (documented to not be freed by lavc for > encoders), so there is a reason for using it instead of > avcodec_free_context() (even when not reusing the context). That's an absolute mess of a situation. av_free(avctx) should not be an allowed or supported scenario when avcodec_free_context() exists. And why is the latter violating its own documentation? > > - Andreas > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".