diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-06 18:44:33 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-27 23:45:45 +0100 |
| commit | 93559adfbfd42c8fb05cd5dc2c7cde866d3dbe87 (patch) | |
| tree | d945348ed639061a717ceaf96467faaab2f62bc5 | |
| parent | 4679e543880ae6f316e00f480ca5a79f33eb1dc9 (diff) | |
| download | ffmpeg-93559adfbfd42c8fb05cd5dc2c7cde866d3dbe87.tar.gz | |
asfdec_o: 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.
Reviewed-by: Alexandra Hájková <alexandra.khirnova@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 0e32153e9c296366e004352ecb3f9fcea74dc17d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavformat/asfdec_o.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 2b3d9e6de5..f8e5e1ec71 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -1434,6 +1434,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 |