diff options
| author | Tomas Härdin <tomas.hardin@codemill.se> | 2012-01-26 13:21:39 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-02-09 12:54:05 +0100 |
| commit | df2a85085e599a7184a88d39d69b21aeb6925fdd (patch) | |
| tree | be8af3d149ea6189bcc6cf1c67f58b6e9a4507ea /libavformat | |
| parent | 11800c8c8961bc261c7e0f4669e50f3a1e4862cd (diff) | |
| download | ffmpeg-df2a85085e599a7184a88d39d69b21aeb6925fdd.tar.gz | |
mxfdec: Sanity check PreviousPartition
Without this certain files could get the demuxer stuck in a loop.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mxfdec.c | 8 |
1 files changed, 8 insertions, 0 deletions
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; |