Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Marton Balint <cus@passwd.hu>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/pngdec: avoid erroring with sBIT on indexed-color images
Date: Thu, 18 Jul 2024 10:47:17 +0200 (CEST)
Message-ID: <499505a9-84f0-ce11-bd65-568b5cd9f654@passwd.hu> (raw)
In-Reply-To: <20240712190317.294917-1-leo.izen@gmail.com>



On Fri, 12 Jul 2024, Leo Izen wrote:

> Indexed color images use three colors for sBIT, but the function
> ff_png_get_nb_channels returns 1 in this case. We should avoid erroring
> out on valid files in this scenario.

Please mention that this is a regression since 
84b454935fae2633a8a5dd075e22393f3e8f932f.

>
> Signed-off-by: Leo Izen <leo.izen@gmail.com>
> Reported-by: Ramiro Polla <ramiro.polla@gmail.com>
> ---
> libavcodec/pngdec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
> index 180806e5e1..b0d02c97dd 100644
> --- a/libavcodec/pngdec.c
> +++ b/libavcodec/pngdec.c
> @@ -1084,7 +1084,7 @@ static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s,
>         return AVERROR_INVALIDDATA;
>     }
>
> -    channels = ff_png_get_nb_channels(s->color_type);
> +    channels = s->color_type & PNG_COLOR_MASK_PALETTE ? 3 : ff_png_get_nb_channels(s->color_type);
>

LGTM, also please backport this to the affected branches!

Thanks,
Marton


>     if (bytestream2_get_bytes_left(gb) != channels)
>         return AVERROR_INVALIDDATA;
> -- 
> 2.45.2
>
> _______________________________________________
> 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".

  parent reply	other threads:[~2024-07-18  8:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-12 19:03 Leo Izen
2024-07-12 19:03 ` [FFmpeg-devel] [PATCH 2/2] avcodec/png: more informative error message for invalid sBIT size Leo Izen
2024-07-12 19:37   ` Paul B Mahol
2024-07-16  2:24   ` Leo Izen
2024-07-18  8:47 ` Marton Balint [this message]
2024-07-18 12:59   ` [FFmpeg-devel] [PATCH 1/2] avcodec/pngdec: avoid erroring with sBIT on indexed-color images Leo Izen

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=499505a9-84f0-ce11-bd65-568b5cd9f654@passwd.hu \
    --to=cus@passwd.hu \
    --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