diff options
| author | Alexandra Hájková <alexandra.khirnova@gmail.com> | 2015-07-28 10:17:16 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-10-08 21:55:31 +0200 |
| commit | 00cc10aee380f882507bac994ac469d8358d12e8 (patch) | |
| tree | c4b557d39b4ecadfa0a2ab70996a2b61ceecad25 /libavformat | |
| parent | a8956eca1ff3b5b7f9aadbe6eb46536efeb2f828 (diff) | |
| download | ffmpeg-00cc10aee380f882507bac994ac469d8358d12e8.tar.gz | |
asfdec: do not skip padding if offset is above packet size - padding
Sample-Id: https://samples.libav.org/asf-wmv/demux-asf-assert-failed.wmv
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index c78a9ded34..a39f6d4c21 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -1428,7 +1428,9 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) case READ_MULTI_SUB: if (!asf->sub_left && !asf->nb_mult_left) { asf->state = PARSE_PACKET_HEADER; - if (!asf->return_subpayload) + if (!asf->return_subpayload && + (avio_tell(pb) <= asf->packet_offset + + asf->packet_size - asf->pad_len)) avio_skip(pb, asf->pad_len); // skip padding if (asf->packet_offset + asf->packet_size > avio_tell(pb)) avio_seek(pb, asf->packet_offset + asf->packet_size, SEEK_SET); @@ -1438,9 +1440,10 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) case READ_MULTI: if (!asf->nb_mult_left) { asf->state = PARSE_PACKET_HEADER; - if (!asf->return_subpayload) { + if (!asf->return_subpayload && + (avio_tell(pb) <= asf->packet_offset + + asf->packet_size - asf->pad_len)) avio_skip(pb, asf->pad_len); // skip padding - } if (asf->packet_offset + asf->packet_size > avio_tell(pb)) avio_seek(pb, asf->packet_offset + asf->packet_size, SEEK_SET); } |