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

avidec: move eof check before continue.

Browse Source 
Fixes a infinite loop
Fixes half of Ticket800
Bug found by Oana Stratulat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-12-20 16:52:42 +01:00
parent abab44086f
commit 3c7f75bd84
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avidec.c
View File

@@ -1232,6 +1232,9 @@ static int avi_read_idx1(AVFormatContext *s, int size)
/* Read the entries and sort them in each stream component. */ /* Read the entries and sort them in each stream component. */
for(i = 0; i < nb_index_entries; i++) { for(i = 0; i < nb_index_entries; i++) {
if(url_feof(pb))
return -1;
tag = avio_rl32(pb); tag = avio_rl32(pb);
flags = avio_rl32(pb); flags = avio_rl32(pb);
pos = avio_rl32(pb); pos = avio_rl32(pb);
@@ -1254,8 +1257,6 @@ static int avi_read_idx1(AVFormatContext *s, int size)
av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len); av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
if(url_feof(pb))
return -1;
if(last_pos == pos) if(last_pos == pos)
avi->non_interleaved= 1; avi->non_interleaved= 1;