From: Alexandra Hájková <alexandra.khirnova@gmail.com>
Date: Tue, 28 Jul 2015 08:17:16 +0000 (+0200)
Subject: asfdec: do not skip padding if offset is above packet size - padding
X-Git-Tag: android-x86-7.1-r1~252^2~1907
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=00cc10aee380f882507bac994ac469d8358d12e8;p=android-x86%2Fexternal-ffmpeg.git

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>
---

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);
             }