[FFmpeg-cvslog] avformat/oggdec: Check for EOF after page header

Michael Niedermayer git at videolan.org
Fri Apr 24 02:14:38 EEST 2020


ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Wed Apr  1 20:58:52 2020 +0200| [b4ac1972576eee8cb84f2461eec10cc5e95c90d3] | committer: Michael Niedermayer

avformat/oggdec: Check for EOF after page header

Fixes: Infinite loop
Fixes: Ticket8594

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit f1589be9fda00c417f9bcccb55dbbea998ee08ac)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4ac1972576eee8cb84f2461eec10cc5e95c90d3
---

 libavformat/oggdec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 7ace0d1c16..91357dc922 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -369,6 +369,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))



More information about the ffmpeg-cvslog mailing list