generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ogg: Fix potential infinite discard loop

Browse Source 
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 <j@v2v.cc>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Reimar Döffinger 2013-08-18 17:40:51 +02:00 committed by Luca Barbato
parent 0a14fefd68
commit 9a27acae9e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/oggdec.c
View File

@ -384,7 +384,11 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
if (!complete && os->segp == os->nsegs) { if (!complete && os->segp == os->nsegs) {
ogg->curidx = -1; 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); } while (!complete);