[FFmpeg-cvslog] mov: detect EOF in mov_read_dref()

Michael Niedermayer git at videolan.org
Sun Dec 18 21:55:26 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 18 21:37:54 2011 +0100| [af3f2a87da1d37e5f227c1c289f62e84422879c2] | committer: Michael Niedermayer

mov: detect EOF in mov_read_dref()
This fixes a (near) infinite loop and Ticket783
Bug found by: cosminamironesei

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af3f2a87da1d37e5f227c1c289f62e84422879c2
---

 libavformat/mov.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 38248d4..3aa9381 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -431,6 +431,8 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             avio_skip(pb, 16);
 
             for (type = 0; type != -1 && avio_tell(pb) < next; ) {
+                if(url_feof(pb))
+                    return AVERROR(EOF);
                 type = avio_rb16(pb);
                 len = avio_rb16(pb);
                 av_log(c->fc, AV_LOG_DEBUG, "type %d, len %d\n", type, len);



More information about the ffmpeg-cvslog mailing list