Message ID | 20200401192914.10296-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | f1589be9fda00c417f9bcccb55dbbea998ee08ac |
Headers | show |
Series | [FFmpeg-devel] avformat/oggdec: Check for EOF after page header | expand |
Context | Check | Description |
---|---|---|
andriy/ffmpeg-patchwork | success | Make fate finished |
On Wed, Apr 01, 2020 at 09:29:14PM +0200, Michael Niedermayer wrote: > Fixes: Infinite loop > Fixes: Ticket8594 > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/oggdec.c | 3 +++ > 1 file changed, 3 insertions(+) will apply [...]
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index de2f24b967..95190589ab 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))
Fixes: Infinite loop Fixes: Ticket8594 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/oggdec.c | 3 +++ 1 file changed, 3 insertions(+)