diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-04 02:12:15 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-04 02:12:15 +0300 |
| commit | 1902bbbe722504dac5966df3d417a1ed8029aea1 (patch) | |
| tree | 757b9fe32bc8501bc38bcd9a2f40520bb2875132 /libavformat/asfdec_o.c | |
| parent | 73c85d3af2420baeee9a8f0429b34012096606ea (diff) | |
| parent | cd7a2e1502f174c725c0de82711d2c7649057574 (diff) | |
Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'
* commit 'cd7a2e1502f174c725c0de82711d2c7649057574':
asfdec: fix reading files larger than 2GB
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/asfdec_o.c')
| -rw-r--r-- | libavformat/asfdec_o.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 86ea962849..818d6f3573 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -976,7 +976,8 @@ 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 uint32_t pkt_num, nb_entries; int32_t prev_pkt_num = -1; - int i, ret; + int i; + int64_t offset; uint64_t size = avio_rl64(pb); // simple index objects should be ordered by stream number, this loop tries to find @@ -998,10 +999,10 @@ static int asf_read_simple_index(AVFormatContext *s, const GUIDParseTable *g) nb_entries = avio_rl32(pb); for (i = 0; i < nb_entries; i++) { pkt_num = avio_rl32(pb); - ret = avio_skip(pb, 2); - if (ret < 0) { + offset = avio_skip(pb, 2); + if (offset < 0) { av_log(s, AV_LOG_ERROR, "Skipping failed in asf_read_simple_index.\n"); - return ret; + return offset; } if (prev_pkt_num != pkt_num) { av_add_index_entry(st, asf->first_packet_offset + asf->packet_size * |