asfdec: break if EOF is reached after asf_read_packet_header
authorAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Wed, 6 Jan 2016 20:09:19 +0000 (21:09 +0100)
committerLuca Barbato <lu_zero@gentoo.org>
Sun, 7 Feb 2016 02:12:33 +0000 (03:12 +0100)
asf_read_payload can unset eof_reached, so check it also before calling
that function.

This fixes infinite loops.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/asfdec.c

index 90a1df4..460df2a 100644 (file)
@@ -1425,6 +1425,8 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
     while (!pb->eof_reached) {
         if (asf->state == PARSE_PACKET_HEADER) {
             asf_read_packet_header(s);
+            if (pb->eof_reached)
+                break;
             if (!asf->nb_mult_left)
                 asf->state = READ_SINGLE;
             else