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-01 12:49:26 +0200
commit94af3d9ca65a8a569cc8cc8c86dce5b440b3ff05 (patch)
tree768040f1a0b5749fede7f618bf35b3e08b43501f
parent6e768588c383ad7fcf71b864023535b79aadfda3 (diff)
downloadffmpeg-94af3d9ca65a8a569cc8cc8c86dce5b440b3ff05.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 f3228a2220..9901d17dd7 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -370,6 +370,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))