Commit 3c7f75bd authored by Michael Niedermayer's avatar Michael Niedermayer

avidec: move eof check before continue.

Fixes a infinite loop
Fixes half of Ticket800
Bug found by Oana Stratulat
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent abab4408
...@@ -1232,6 +1232,9 @@ static int avi_read_idx1(AVFormatContext *s, int size) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment