aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-09 12:07:28 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-11 21:23:48 +0200
commitd46b698478f11ab85135b3cf0a7944c4dd62e37c (patch)
tree700347786700230f75e31b4833b521f70d0e2876
parenta79700555fb2de8f18dbb0bd0c72a77aa59613f1 (diff)
downloadffmpeg-d46b698478f11ab85135b3cf0a7944c4dd62e37c.tar.gz
avformat/mm: Check for existence of audio stream
No audio stream is created unconditionally and if none has been created, no packet with stream_index 1 may be returned. This fixes an assert in ff_read_packet() in libavformat/utils reported in ticket #8782. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> (cherry picked from commit ec59dc73f0cc8930bf5dae389cd76d049d537ca7) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/mm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 8a1382e03c..de5f9d6161 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -174,6 +174,8 @@ static int read_packet(AVFormatContext *s,
return 0;
case MM_TYPE_AUDIO :
+ if (s->nb_streams < 2)
+ return AVERROR_INVALIDDATA;
if (av_get_packet(s->pb, pkt, length)<0)
return AVERROR(ENOMEM);
pkt->stream_index = 1;