From: Tomas Härdin <tomas.hardin@codemill.se>
Date: Thu, 26 Jan 2012 12:21:31 +0000 (+0100)
Subject: mxfdec: Make sure x < index_table->nb_ptses
X-Git-Tag: android-x86-4.4-r1~8529^2~3327
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a3923482f2a2b7895b1f6ef691765f035526fc78;p=android-x86%2Fexternal-ffmpeg.git

mxfdec: Make sure x < index_table->nb_ptses

Avoids a SIGSEGV on files with IndexEntryCount < IndexDuration.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
---

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 96b662f431..d7f3c5ea44 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1113,6 +1113,13 @@ static int mxf_compute_ptses_fake_index(MXFContext *mxf, MXFIndexTable *index_ta
             int offset = s->temporal_offset_entries[j] / index_delta;
             int index  = x + offset;
 
+            if (x >= index_table->nb_ptses) {
+                av_log(mxf->fc, AV_LOG_ERROR,
+                       "x >= nb_ptses - IndexEntryCount %i < IndexDuration %"PRId64"?\n",
+                       s->nb_index_entries, s->index_duration);
+                break;
+            }
+
             index_table->fake_index[x].timestamp = x;
             index_table->fake_index[x].flags = !(s->flag_entries[j] & 0x30) ? AVINDEX_KEYFRAME : 0;