From 9a27acae9e6b7d0bf74c5b878af9c42495a546f3 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sun, 18 Aug 2013 17:40:51 +0200 Subject: ogg: Fix potential infinite discard loop Seeking in certain broken files would cause ogg_read_timestamp to fail because ogg_packet would go into a state where all packets of stream 1 would be discarded until the end of the stream. Bug-Id: 553 CC: libav-stable@libav.org Signed-off-by: Jan Gerber Signed-off-by: Luca Barbato --- libavformat/oggdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavformat/oggdec.c') diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 6514c5b153..d22d5bc5b8 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -384,7 +384,11 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize, if (!complete && os->segp == os->nsegs) { ogg->curidx = -1; - os->incomplete = 1; + // Do not set incomplete for empty packets. + // Together with the code in ogg_read_page + // that discards all continuation of empty packets + // we would get an infinite loop. + os->incomplete = !!os->psize; } } while (!complete); -- cgit v1.2.3