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

ffmdec: fix infinite loop at EOF

Browse Source 
If EOF is reached, while skipping bytes, avio_tell(pb) won't change
anymore, resulting in an infinite loop.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6fa98822eb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andreas Cadhalpun
2015-03-08 23:31:48 +01:00
committed by Michael Niedermayer
parent 6a671797d7
commit d81150929d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ffmdec.c
View File

@@ -354,7 +354,7 @@ static int ffm2_read_header(AVFormatContext *s)
} }
/* get until end of block reached */ /* get until end of block reached */
while ((avio_tell(pb) % ffm->packet_size) != 0) while ((avio_tell(pb) % ffm->packet_size) != 0 && !pb->eof_reached)
avio_r8(pb); avio_r8(pb);
/* init packet demux */ /* init packet demux */
@@ -481,7 +481,7 @@ static int ffm_read_header(AVFormatContext *s)
} }
/* get until end of block reached */ /* get until end of block reached */
while ((avio_tell(pb) % ffm->packet_size) != 0) while ((avio_tell(pb) % ffm->packet_size) != 0 && !pb->eof_reached)
avio_r8(pb); avio_r8(pb);
/* init packet demux */ /* init packet demux */