aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Härdin <tomas.hardin@codemill.se>2011-12-20 11:22:23 +0100
committerTomas Härdin <tomas.hardin@codemill.se>2011-12-20 11:32:59 +0100
commit1888bd1b6d2bedc7bbded91d3a8d236236b5aa3c (patch)
treed9a3a904fd24ccd1af049fe05ff0d7bf0f21e4fa
parent54cbbdd25abbdea251afbaa9b7c42cdc63d9ebc8 (diff)
downloadffmpeg-1888bd1b6d2bedc7bbded91d3a8d236236b5aa3c.tar.gz
mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
Only the OPAtom demuxing logic is guaranteed to have index tables, meaning OP1a files that lack an index would cause SIGSEGV.
-rw-r--r--libavformat/mxfdec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 254061c03c..75d4b51a3f 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1714,6 +1714,10 @@ static void mxf_packet_timestamps(MXFContext *mxf, AVPacket *pkt)
int64_t next_ofs;
MXFIndexTable *t = &mxf->index_tables[0];
+ /* this is called from the OP1a demuxing logic, which means there may be no index tables */
+ if (mxf->nb_index_tables <= 0)
+ return;
+
/* find mxf->current_edit_unit so that the next edit unit starts ahead of pkt->pos */
for (;;) {
if (mxf_edit_unit_absolute_offset(mxf, t, mxf->current_edit_unit + 1, NULL, &next_ofs, 0) < 0)
@@ -1795,6 +1799,7 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
return mxf_read_packet_old(s, pkt);
/* OPAtom - clip wrapped demuxing */
+ /* NOTE: mxf_read_header() makes sure nb_index_tables > 0 for OPAtom */
st = s->streams[0];
t = &mxf->index_tables[0];