diff mbox series

[FFmpeg-devel,v2] avfilter/af_surround: Check output format

Message ID 20240712201809.609209-1-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,v2] avfilter/af_surround: Check output format | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer July 12, 2024, 8:18 p.m. UTC 
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(+)

Comments

Michael Niedermayer Aug. 11, 2024, 10:39 a.m. UTC | #1 
On Fri, Jul 12, 2024 at 10:18:09PM +0200, Michael Niedermayer wrote:
> 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(+)

will apply

[...]
diff mbox series

Patch

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;