diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 20:09:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 22:04:03 +0100 |
| commit | a7f27453f64d9020b92b01687baeb5909c6cdad0 (patch) | |
| tree | 51efd57a9b353a15fcda869c780632c163138c00 /libavformat | |
| parent | 64821f5a7cc85f8d7cfc69b5caaa8d766faedc2e (diff) | |
avformat/mov: Check that we have a stream before accessing it in mov_read_ares()
Fixes out of array read
Fixes: signal_sigsegv_6f1855_3910_avid_test_alpha.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 3da31ac629..bb141c8a2a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1042,15 +1042,17 @@ static int mov_read_targa_y216(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - AVCodecContext *codec = c->fc->streams[c->fc->nb_streams-1]->codec; - if (codec->codec_tag == MKTAG('A', 'V', 'i', 'n') && - codec->codec_id == AV_CODEC_ID_H264 && - atom.size > 11) { - avio_skip(pb, 10); - /* For AVID AVCI50, force width of 1440 to be able to select the correct SPS and PPS */ - if (avio_rb16(pb) == 0xd4d) - codec->width = 1440; - return 0; + if (c->fc->nb_streams >= 1) { + AVCodecContext *codec = c->fc->streams[c->fc->nb_streams-1]->codec; + if (codec->codec_tag == MKTAG('A', 'V', 'i', 'n') && + codec->codec_id == AV_CODEC_ID_H264 && + atom.size > 11) { + avio_skip(pb, 10); + /* For AVID AVCI50, force width of 1440 to be able to select the correct SPS and PPS */ + if (avio_rb16(pb) == 0xd4d) + codec->width = 1440; + return 0; + } } return mov_read_avid(c, pb, atom); |