From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH v2] avfilter/af_surround: Check output format
Date: Fri, 12 Jul 2024 22:18:09 +0200
Message-ID: <20240712201809.609209-1-michael@niedermayer.cc> (raw)
Fixes: CID1516994 Out-of-bounds access
Fixes: CID1516996 Out-of-bounds access
Fixes: CID1516999 Out-of-bounds access
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavfilter/af_surround.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c
index e37dddc3614..d42a23b8ad2 100644
--- a/libavfilter/af_surround.c
+++ b/libavfilter/af_surround.c
@@ -1123,6 +1123,31 @@ static av_cold int init(AVFilterContext *ctx)
s->create_lfe = av_channel_layout_index_from_channel(&s->out_ch_layout,
AV_CHAN_LOW_FREQUENCY) >= 0;
+ switch (out_channel_layout) {
+ case AV_CH_LAYOUT_MONO:
+ case AV_CH_LAYOUT_STEREO:
+ case AV_CH_LAYOUT_2POINT1:
+ case AV_CH_LAYOUT_2_1:
+ case AV_CH_LAYOUT_2_2:
+ case AV_CH_LAYOUT_SURROUND:
+ case AV_CH_LAYOUT_3POINT1:
+ case AV_CH_LAYOUT_QUAD:
+ case AV_CH_LAYOUT_4POINT0:
+ case AV_CH_LAYOUT_4POINT1:
+ case AV_CH_LAYOUT_5POINT0:
+ case AV_CH_LAYOUT_5POINT1:
+ case AV_CH_LAYOUT_5POINT0_BACK:
+ case AV_CH_LAYOUT_5POINT1_BACK:
+ case AV_CH_LAYOUT_6POINT0:
+ case AV_CH_LAYOUT_6POINT1:
+ case AV_CH_LAYOUT_7POINT0:
+ case AV_CH_LAYOUT_7POINT1:
+ case AV_CH_LAYOUT_OCTAGONAL:
+ break;
+ default:
+ goto fail;
+ }
+
switch (in_channel_layout) {
case AV_CH_LAYOUT_STEREO:
s->filter = filter_stereo;
--
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".
next reply other threads:[~2024-07-12 20:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-12 20:18 Michael Niedermayer [this message]
2024-08-11 10:39 ` Michael Niedermayer
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=20240712201809.609209-1-michael@niedermayer.cc \
--to=michael@niedermayer.cc \
--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