Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/evc_ps: Fix leak on error
Date: Tue, 26 Sep 2023 20:44:13 +0200
Message-ID: <GV1P250MB07374E3279E11FCDEE733D848FC3A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB0744C05F96CC8C560B9C4A728FF8A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>

Andreas Rheinhardt:
> Regression since 4565747056a11356210ed8edcecb920105e40b60.
> Fixes Coverity ticket #1545072.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/evc_ps.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/evc_ps.c b/libavcodec/evc_ps.c
> index 6f93f5b373..64d60f44e2 100644
> --- a/libavcodec/evc_ps.c
> +++ b/libavcodec/evc_ps.c
> @@ -243,8 +243,10 @@ int ff_evc_parse_sps(GetBitContext *gb, EVCParamSets *ps)
>          sps->max_num_tid0_ref_pics = get_ue_golomb_31(gb);
>      else {
>          sps->sps_max_dec_pic_buffering_minus1 = get_ue_golomb_long(gb);
> -        if ((unsigned)sps->sps_max_dec_pic_buffering_minus1 > 16 - 1)
> -            return AVERROR_INVALIDDATA;
> +        if ((unsigned)sps->sps_max_dec_pic_buffering_minus1 > 16 - 1) {
> +            ret = AVERROR_INVALIDDATA;
> +            goto fail;
> +        }
>          sps->long_term_ref_pic_flag = get_bits1(gb);
>          sps->rpl1_same_as_rpl0_flag = get_bits1(gb);
>          sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(gb);

Will apply.

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

      reply	other threads:[~2023-09-26 18:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-21 17:19 Andreas Rheinhardt
2023-09-26 18:44 ` Andreas Rheinhardt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=GV1P250MB07374E3279E11FCDEE733D848FC3A@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM \
    --to=andreas.rheinhardt@outlook.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git