Module: libav Branch: master Commit: a32dbf2aed3bb720a28141e1e84284ade3969a49
Author: Andreas Cadhalpun <[email protected]> Committer: Luca Barbato <[email protected]> Date: Wed Jan 6 21:09:19 2016 +0100 asfdec: break if EOF is reached after asf_read_packet_header asf_read_payload can unset eof_reached, so check it also before calling that function. This fixes infinite loops. Signed-off-by: Andreas Cadhalpun <[email protected]> Signed-off-by: Alexandra Hájková <[email protected]> Signed-off-by: Luca Barbato <[email protected]> --- libavformat/asfdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 90a1df4..460df2a 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -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 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
