From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/dvbsubenc: Use 64bits in nb_colors and num_rects checks
Date: Wed, 16 Apr 2025 11:18:53 +0200
Message-ID: <GV1P250MB07373B74BAF6EF27F91C1CF88FBD2@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20250404202901.3283283-1-michael@niedermayer.cc>
Michael Niedermayer:
> Fixes: integer overflow
>
> No testcase
>
> Found-by: 김승호 <kimsho98@naver.com>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/dvbsubenc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/dvbsubenc.c b/libavcodec/dvbsubenc.c
> index 822e3a53099..53f0f6412fa 100644
> --- a/libavcodec/dvbsubenc.c
> +++ b/libavcodec/dvbsubenc.c
> @@ -302,7 +302,7 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size,
>
> /* page composition segment */
>
> - if (buf_size < 8 + h->num_rects * 6)
> + if (buf_size < 8 + h->num_rects * 6LL)
> return AVERROR_BUFFER_TOO_SMALL;
> *q++ = 0x0f; /* sync_byte */
> *q++ = 0x10; /* segment_type */
> @@ -326,7 +326,7 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size,
>
> if (h->num_rects) {
> for (clut_id = 0; clut_id < h->num_rects; clut_id++) {
> - if (buf_size < 6 + h->rects[clut_id]->nb_colors * 6)
> + if (buf_size < 6 + h->rects[clut_id]->nb_colors * 6LL)
> return AVERROR_BUFFER_TOO_SMALL;
>
> /* CLUT segment */
I just sent different patches for this:
https://ffmpeg.org/pipermail/ffmpeg-devel/2025-April/342314.html
They are intended to make your patches obsolete.
- 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".
prev parent reply other threads:[~2025-04-16 9:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-04 20:29 Michael Niedermayer
2025-04-04 20:29 ` [FFmpeg-devel] [PATCH 2/2] avcodec/encode: Check nb_colors Michael Niedermayer
2025-04-16 9:18 ` 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=GV1P250MB07373B74BAF6EF27F91C1CF88FBD2@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