[FFmpeg-cvslog] mxfdec: Check url_feof() in mxf_read_local_tags()

Tomas Härdin git at videolan.org
Thu Dec 22 14:32:44 CET 2011


ffmpeg | branch: master | Tomas Härdin <tomas.hardin at codemill.se> | Tue Dec 20 17:39:59 2011 +0100| [2116e4ba917748c0985be2347d400ba0f3fe6c64] | committer: Tomas Härdin

mxfdec: Check url_feof() in mxf_read_local_tags()

This fixes the infinite loop with zzuf2.mxf

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

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

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 59c8b40..8d60fe7 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1437,7 +1437,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
 
     if (!ctx)
         return -1;
-    while (avio_tell(pb) + 4 < klv_end) {
+    while (avio_tell(pb) + 4 < klv_end && !url_feof(pb)) {
         int tag = avio_rb16(pb);
         int size = avio_rb16(pb); /* KLV specified by 0x53 */
         uint64_t next = avio_tell(pb) + size;



More information about the ffmpeg-cvslog mailing list