highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for EOF during index reading.

Browse Source 
Originally committed as revision 17496 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2009-02-21 20:44:39 +00:00
parent a90de11dba
commit 8ebe099ac0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avidec.c
View File

@@ -165,6 +165,9 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
#ifdef DEBUG_SEEK #ifdef DEBUG_SEEK
av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len); av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len);
#endif #endif
if(url_feof(pb))
return -1;
if(last_pos == pos || pos == base - 8) if(last_pos == pos || pos == base - 8)
avi->non_interleaved= 1; avi->non_interleaved= 1;
if(last_pos != pos) if(last_pos != pos)
@@ -181,6 +184,10 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
offset = get_le64(pb); offset = get_le64(pb);
get_le32(pb); /* size */ get_le32(pb); /* size */
duration = get_le32(pb); duration = get_le32(pb);
if(url_feof(pb))
return -1;
pos = url_ftell(pb); pos = url_ftell(pb);
url_fseek(pb, offset+8, SEEK_SET); url_fseek(pb, offset+8, SEEK_SET);
@@ -923,6 +930,9 @@ static int avi_read_idx1(AVFormatContext *s, int size)
#if defined(DEBUG_SEEK) #if defined(DEBUG_SEEK)
av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len); av_log(s, AV_LOG_DEBUG, "%d cum_len=%"PRId64"\n", len, ast->cum_len);
#endif #endif
if(url_feof(pb))
return -1;
if(last_pos == pos) if(last_pos == pos)
avi->non_interleaved= 1; avi->non_interleaved= 1;
else else