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

avidec: Check return value of more avio_seek calls

Browse Source 
The move of avio_seek in avi_read_seek is to avoiding modifying
state if the seek would fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Joakim Plate 2011-09-12 04:07:36 +02:00 committed by Michael Niedermayer
parent ac1d489320
commit f9e083a156
1 changed files with 12 additions and 4 deletions

16
libavformat/avidec.c

@ -222,13 +222,18 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num){
return -1; return -1;
} }
avio_seek(pb, offset+8, SEEK_SET); if(avio_seek(pb, offset+8, SEEK_SET) < 0)
return -1;
avi->odml_depth++; avi->odml_depth++;
read_braindead_odml_indx(s, frame_num); read_braindead_odml_indx(s, frame_num);
avi->odml_depth--; avi->odml_depth--;
frame_num += duration; frame_num += duration;
avio_seek(pb, pos, SEEK_SET); if(avio_seek(pb, pos, SEEK_SET) < 0) {
av_log(s, AV_LOG_ERROR, "Failed to restore position after reading index");
return -1;
}
} }
} }
avi->index_loaded=1; avi->index_loaded=1;
@ -1365,11 +1370,13 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
/* the av_index_search_timestamp call above. */ /* the av_index_search_timestamp call above. */
assert(stream_index == 0); assert(stream_index == 0);
if(avio_seek(s->pb, pos, SEEK_SET) < 0)
return -1;
/* Feed the DV video stream version of the timestamp to the */ /* Feed the DV video stream version of the timestamp to the */
/* DV demux so it can synthesize correct timestamps. */ /* DV demux so it can synthesize correct timestamps. */
dv_offset_reset(avi->dv_demux, timestamp); dv_offset_reset(avi->dv_demux, timestamp);
avio_seek(s->pb, pos, SEEK_SET);
avi->stream_index= -1; avi->stream_index= -1;
return 0; return 0;
} }
@ -1420,7 +1427,8 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
} }
/* do the seek */ /* do the seek */
avio_seek(s->pb, pos_min, SEEK_SET); if (avio_seek(s->pb, pos_min, SEEK_SET) < 0)
return -1;
avi->stream_index= -1; avi->stream_index= -1;
avi->dts_max= INT_MIN; avi->dts_max= INT_MIN;
return 0; return 0;