[FFmpeg-cvslog] mxfdec: Sanity check PreviousPartition

[Tomas Härdin]

ffmpeg | branch: master | Tomas Härdin <tomas.hardin at codemill.se> | Wed Dec 21 10:56:59 2011 +0100| [46d65fb8a574465499a470d0c34a30902e45176a] | committer: Tomas Härdin

mxfdec: Sanity check PreviousPartition

Without this certain files could get the demuxer stuck in a loop

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

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

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index e136374..15c2a21 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -479,6 +479,13 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
             partition->previous_partition, footer_partition,
             partition->index_sid, partition->body_sid);
 
+    /* sanity check PreviousPartition if set */
+    if (partition->previous_partition &&
+        mxf->run_in + partition->previous_partition >= klv_offset) {
+        av_log(mxf->fc, AV_LOG_ERROR, "PreviousPartition points to this partition or forward\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     if      (op[12] == 1 && op[13] == 1) mxf->op = OP1a;
     else if (op[12] == 1 && op[13] == 2) mxf->op = OP1b;
     else if (op[12] == 1 && op[13] == 3) mxf->op = OP1c;