From 5c2097cff79c66cb1a3aa7f49133fa265d9fb633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Wed, 21 Dec 2011 10:56:59 +0100 Subject: [PATCH] mxfdec: Sanity check PreviousPartition Without this certain files could get the demuxer stuck in a loop (cherry picked from commit 46d65fb8a574465499a470d0c34a30902e45176a) Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index fe3a7ccdfa..e97b2a45f4 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -577,6 +577,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;