[FFmpeg-devel] [PATCH] avformat/iamfdec: Check side_substream_id before use

[FFmpeg-devel] [PATCH] avformat/iamfdec: Check side_substream_id before use

[Michael Niedermayer]

Fixes: poc-iamf-2025-04

Found-by: 苏童 <220235212@seu.edu.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/iamfdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c
index 0f273bdd438..3a6276dcdea 100644
--- a/libavformat/iamfdec.c
+++ b/libavformat/iamfdec.c
@@ -126,7 +126,7 @@ static int iamf_read_header(AVFormatContext *s)
 
         // Swap back and side stream ids as our native channel layout ordering doen't match the
         // order from ITU-R - BS.2051-3 for Systems I and J (where side channels come before back ones).
-        if (back_substream_id >= 0 && av_channel_layout_compare(&layer->ch_layout,
+        if (back_substream_id >= 0 && side_substream_id >= 0 && av_channel_layout_compare(&layer->ch_layout,
                                                                 &(AVChannelLayout)AV_CHANNEL_LAYOUT_9POINT1POINT6)) {
             const IAMFSubStream *back_substream = &audio_element->substreams[back_substream_id];
             const IAMFSubStream *side_substream = &audio_element->substreams[side_substream_id];
-- 
2.49.0

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

Re: [FFmpeg-devel] [PATCH] avformat/iamfdec: Check side_substream_id before use

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1456 bytes --]

On Wed, Apr 23, 2025 at 01:45:20AM +0200, Michael Niedermayer wrote:
> Fixes: poc-iamf-2025-04
> 
> Found-by: 苏童 <220235212@seu.edu.cn>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/iamfdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c
> index 0f273bdd438..3a6276dcdea 100644
> --- a/libavformat/iamfdec.c
> +++ b/libavformat/iamfdec.c
> @@ -126,7 +126,7 @@ static int iamf_read_header(AVFormatContext *s)
>  
>          // Swap back and side stream ids as our native channel layout ordering doen't match the
>          // order from ITU-R - BS.2051-3 for Systems I and J (where side channels come before back ones).
> -        if (back_substream_id >= 0 && av_channel_layout_compare(&layer->ch_layout,
> +        if (back_substream_id >= 0 && side_substream_id >= 0 && av_channel_layout_compare(&layer->ch_layout,
>                                                                  &(AVChannelLayout)AV_CHANNEL_LAYOUT_9POINT1POINT6)) {
>              const IAMFSubStream *back_substream = &audio_element->substreams[back_substream_id];
>              const IAMFSubStream *side_substream = &audio_element->substreams[side_substream_id];

will apply

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

What is money laundering? Its paying someone and not telling the government.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

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