[FFmpeg-cvslog] mxfdec: Make sure x < index_table->nb_ptses
Tomas Härdin
git at videolan.org
Wed Dec 21 16:03:01 CET 2011
ffmpeg | branch: master | Tomas Härdin <tomas.hardin at codemill.se> | Tue Dec 20 09:57:07 2011 +0100| [6e9081f4d87b4ebcd3355ebd560307c59d2104c3] | committer: Tomas Härdin
mxfdec: Make sure x < index_table->nb_ptses
Without this the demuxer will SIGSEGV on files with IndexEntryCount < IndexDuration
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e9081f4d87b4ebcd3355ebd560307c59d2104c3
---
libavformat/mxfdec.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 8a5c3c9..ea11293 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1085,6 +1085,12 @@ 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;
More information about the ffmpeg-cvslog
mailing list