Re: [FFmpeg-devel] [PATCH 2/6] apv_decode: Fix memory leak on decode error

From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 2/6] apv_decode: Fix memory leak on decode error
Date: Sat, 3 May 2025 19:46:34 -0300
Message-ID: <cb282046-f715-4cd3-9617-9a5a3b9bfabd@gmail.com> (raw)
In-Reply-To: <20250503175527.1517092-2-sw@jkqxz.net>

[-- Attachment #1.1.1: Type: text/plain, Size: 1117 bytes --]

On 5/3/2025 2:55 PM, Mark Thompson wrote:
> ---
>   libavcodec/apv_decode.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c
> index b1e1db7d64..2a59c9b25d 100644
> --- a/libavcodec/apv_decode.c
> +++ b/libavcodec/apv_decode.c
> @@ -377,7 +377,7 @@ static int apv_decode_frame(AVCodecContext *avctx, AVFrame *frame,
>           case APV_PBU_PRIMARY_FRAME:
>               err = apv_decode(avctx, frame, pbu->content);
>               if (err < 0)
> -                return err;
> +                goto fail;
>               *got_frame = 1;
>               break;
>           case APV_PBU_METADATA:
> @@ -412,8 +412,11 @@ static int apv_decode_frame(AVCodecContext *avctx, AVFrame *frame,
>       }
>   
>       ff_cbs_fragment_reset(au);
> -
>       return packet->size;
> +
> +fail:
> +    ff_cbs_fragment_reset(au);
> +    return err;
>   }
>   
>   const FFCodec ff_apv_decoder = {

nit: could instead make it

     err = packet->size;
fail:
     ff_cbs_fragment_reset(au);
     return err;

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".