diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-04-01 20:58:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-19 17:17:36 +0200 |
| commit | 33d17d1b539b408cdf9d5237c2f7924fd8a8b7d3 (patch) | |
| tree | f2fde37cf24d1441a14e0b1666a8f2a0fc2b8d57 | |
| parent | 01628af26da4aff41053bb2c3e96bdf184ad661e (diff) | |
| download | ffmpeg-33d17d1b539b408cdf9d5237c2f7924fd8a8b7d3.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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 128f14b746..4f62da3b9d 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)) |