From d46b698478f11ab85135b3cf0a7944c4dd62e37c Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Date: Thu, 9 Jul 2020 12:07:28 +0200
Subject: [PATCH] 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>
---
libavformat/mm.c | 2 ++
1 file changed, 2 insertions(+)
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;