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

Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.

Browse Source 
Originally committed as revision 19330 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-07-03 11:18:07 +00:00
parent 0410ee8f86
commit 68a10b40bc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/asfdec.c
View File

@@ -595,6 +595,9 @@ static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
int rsize = 8; int rsize = 8;
int c, d, e, off; int c, d, e, off;
// if we do not know packet size, allow skipping up to 32 kB
off= 32768;
if (s->packet_size > 0)
off= (url_ftell(pb) - s->data_offset) % s->packet_size + 3; off= (url_ftell(pb) - s->data_offset) % s->packet_size + 3;
c=d=e=-1; c=d=e=-1;
@@ -989,6 +992,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos,
start_pos[i]= pos; start_pos[i]= pos;
} }
if (s->packet_size > 0)
pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset; pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset;
*ppos= pos; *ppos= pos;
url_fseek(s->pb, pos, SEEK_SET); url_fseek(s->pb, pos, SEEK_SET);