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

avformat/asfdec: Use 64bit ret to avoid overflow

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d4936d28a1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-20 19:29:12 +01:00
parent 303ecfc373
commit c7565b143c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/asfdec.c
View File

@ -1484,7 +1484,7 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index)
ff_asf_guid g; ff_asf_guid g;
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
int64_t current_pos = avio_tell(s->pb); int64_t current_pos = avio_tell(s->pb);
int ret = 0; int64_t ret;
if((ret = avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET)) < 0) { if((ret = avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET)) < 0) {
return ret; return ret;
@ -1554,7 +1554,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
/* Try using the protocol's read_seek if available */ /* Try using the protocol's read_seek if available */
if (s->pb) { if (s->pb) {
int ret = avio_seek_time(s->pb, stream_index, pts, flags); int64_t ret = avio_seek_time(s->pb, stream_index, pts, flags);
if (ret >= 0) if (ret >= 0)
asf_reset_header(s); asf_reset_header(s);
if (ret != AVERROR(ENOSYS)) if (ret != AVERROR(ENOSYS))