aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-04-01 20:58:52 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-02 19:55:09 +0200
commite0c13429cacb4d1510081c0153703ff688ced7c3 (patch)
treea7b32f091533341ef5f879952cbac0d1dabf0e17
parent3a53f3795084afef052ca46beb51b83ffc89b988 (diff)
downloadffmpeg-e0c13429cacb4d1510081c0153703ff688ced7c3.tar.gz
avformat/oggdec: Check for EOF after page header
Fixes: Infinite loop Fixes: Ticket8594 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f1589be9fda00c417f9bcccb55dbbea998ee08ac) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/oggdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 8794871c80..58e3bd871a 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -389,6 +389,9 @@ static int ogg_read_page(AVFormatContext *s, int *sid)
avio_skip(bc, 8); /* seq, crc */
nsegs = avio_r8(bc);
+ if (avio_feof(bc))
+ return AVERROR_EOF;
+
idx = ogg_find_stream(ogg, serial);
if (idx < 0) {
if (data_packets_seen(ogg))