virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

asfdec_o: check avio_skip in asf_read_simple_index

Browse Source 
The loop can be very long, even though the file is very short.

Reviewed-by: Alexandra Hájková <alexandra.khirnova@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun 2016-01-06 13:54:59 +01:00
parent aa18016996
commit 0002d845e8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/asfdec_o.c
View File

@ -970,7 +970,7 @@ static int asf_read_simple_index(AVFormatContext *s, const GUIDParseTable *g)
uint64_t interval; // index entry time interval in 100 ns units, usually it's 1s uint64_t interval; // index entry time interval in 100 ns units, usually it's 1s
uint32_t pkt_num, nb_entries; uint32_t pkt_num, nb_entries;
int32_t prev_pkt_num = -1; int32_t prev_pkt_num = -1;
int i; int i, ret;
uint64_t size = avio_rl64(pb); uint64_t size = avio_rl64(pb);
// simple index objects should be ordered by stream number, this loop tries to find // simple index objects should be ordered by stream number, this loop tries to find
@ -992,7 +992,11 @@ static int asf_read_simple_index(AVFormatContext *s, const GUIDParseTable *g)
nb_entries = avio_rl32(pb); nb_entries = avio_rl32(pb);
for (i = 0; i < nb_entries; i++) { for (i = 0; i < nb_entries; i++) {
pkt_num = avio_rl32(pb); pkt_num = avio_rl32(pb);
avio_skip(pb, 2); ret = avio_skip(pb, 2);
if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Skipping failed in asf_read_simple_index.\n");
return ret;
}
if (prev_pkt_num != pkt_num) { if (prev_pkt_num != pkt_num) {
av_add_index_entry(st, asf->first_packet_offset + asf->packet_size * av_add_index_entry(st, asf->first_packet_offset + asf->packet_size *
pkt_num, av_rescale(interval, i, 10000), pkt_num, av_rescale(interval, i, 10000),