From 3c7f75bd84b4c30a0f86a491a37f759dfaaab86d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 20 Dec 2011 16:52:42 +0100 Subject: [PATCH] avidec: move eof check before continue. Fixes a infinite loop Fixes half of Ticket800 Bug found by Oana Stratulat Signed-off-by: Michael Niedermayer --- libavformat/avidec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index ec543d76d0..9191b625c4 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1232,6 +1232,9 @@ static int avi_read_idx1(AVFormatContext *s, int size) /* Read the entries and sort them in each stream component. */ for(i = 0; i < nb_index_entries; i++) { + if(url_feof(pb)) + return -1; + tag = avio_rl32(pb); flags = 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); - if(url_feof(pb)) - return -1; if(last_pos == pos) avi->non_interleaved= 1;