diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-02-09 18:41:17 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-02-09 18:41:17 +0000 |
| commit | e91ba7dc9d0c475f7b58b906033fa71826084d4b (patch) | |
| tree | 8c643c55722a0e345bc3a9646ffe7561e752aabe | |
| parent | 95f90d27d213fc3b9ca238a542728cd36a7583c7 (diff) | |
add one missing check for stream existence in read_elst, fix #1364
backported patch r19792 by bcoudurier
Originally committed as revision 21709 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index b34326c3cf..1beba9ef90 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1776,9 +1776,13 @@ free_and_return: /* edit list atom */ static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOVAtom atom) { - MOVStreamContext *sc = c->fc->streams[c->fc->nb_streams-1]->priv_data; + MOVStreamContext *sc; int i, edit_count; + if (c->fc->nb_streams < 1) + return 0; + sc = c->fc->streams[c->fc->nb_streams-1]->priv_data; + get_byte(pb); /* version */ get_be24(pb); /* flags */ edit_count = get_be32(pb); /* entries */ |