Re: [FFmpeg-devel] [PATCH 4/6] avformat/iamfdec: Files without streams cannot have packets

From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 4/6] avformat/iamfdec: Files without streams cannot have packets
Date: Fri, 26 Apr 2024 09:56:41 -0300
Message-ID: <6dc7077f-709b-4e5f-bffe-8c7c5de60dd1@gmail.com> (raw)
In-Reply-To: <20240426030839.3001504-4-michael@niedermayer.cc>

On 4/26/2024 12:08 AM, Michael Niedermayer wrote:
> Fixes: Assertion pkt->stream_index < (unsigned)s->nb_streams && "Invalid stream index.\n" failed at libavformat/demux.c:572
> Fixes: 67890/clusterfuzz-testcase-minimized-ffmpeg_dem_IAMF_fuzzer-5166340789829632.fuzz
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>   libavformat/iamfdec.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c
> index e34d13e74c5..67ff7e8f01a 100644
> --- a/libavformat/iamfdec.c
> +++ b/libavformat/iamfdec.c
> @@ -162,6 +162,9 @@ static int iamf_read_packet(AVFormatContext *s, AVPacket *pkt)
>       IAMFDemuxContext *const c = s->priv_data;
>       int ret;
>   
> +    if (!s->nb_streams)
> +        return AVERROR_EOF;
> +
>       ret = ff_iamf_read_packet(s, c, s->pb, INT_MAX, pkt);
>       if (ret < 0)
>           return ret;

This should be checked in iamf_read_header() instead, after the 
nb_audio_elements loop that would add streams, and return INVALIDDATA if 
there's none.
_______________________________________________
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".