[FFmpeg-cvslog] r17496 - trunk/libavformat/avidec.c

[michael]

Author: michael
Date: Sat Feb 21 21:44:39 2009
New Revision: 17496

Log:
Check for EOF during index reading.

Modified:
   trunk/libavformat/avidec.c

Modified: trunk/libavformat/avidec.c
==============================================================================
--- trunk/libavformat/avidec.c	Sat Feb 21 21:38:27 2009	(r17495)
+++ trunk/libavformat/avidec.c	Sat Feb 21 21:44:39 2009	(r17496)
@@ -165,6 +165,9 @@ static int read_braindead_odml_indx(AVFo
 #ifdef DEBUG_SEEK
             av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
 #endif
+            if(url_feof(pb))
+                return -1;
+
             if(last_pos == pos || pos == base - 8)
                 avi->non_interleaved= 1;
             if(last_pos != pos)
@@ -181,6 +184,10 @@ static int read_braindead_odml_indx(AVFo
             offset = get_le64(pb);
             get_le32(pb);       /* size */
             duration = get_le32(pb);
+
+            if(url_feof(pb))
+                return -1;
+
             pos = url_ftell(pb);
 
             url_fseek(pb, offset+8, SEEK_SET);
@@ -923,6 +930,9 @@ static int avi_read_idx1(AVFormatContext
 #if defined(DEBUG_SEEK)
         av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
 #endif
+        if(url_feof(pb))
+            return -1;
+
         if(last_pos == pos)
             avi->non_interleaved= 1;
         else