From df2a85085e599a7184a88d39d69b21aeb6925fdd Mon Sep 17 00:00:00 2001 From: Tomas Härdin Date: Thu, 26 Jan 2012 13:21:39 +0100 Subject: mxfdec: Sanity check PreviousPartition Without this certain files could get the demuxer stuck in a loop. Signed-off-by: Diego Biurrun --- libavformat/mxfdec.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libavformat') diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index d305e73977..582c120c8d 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -484,6 +484,14 @@ 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; -- cgit v1.2.3