diff options
author | Zhang Rui <bbcallen@gmail.com> | 2015-01-29 17:55:32 +0800 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 14:25:04 +0100 |
commit | 038f3a173f59c9fc3396aa38e7972661da7ca504 (patch) | |
tree | 733d6f35153b0b08ca41eaf969884b1d882629a4 /libavformat/concatdec.c | |
parent | d39fa69dfc64d96562d2d2707bf250493d53d34c (diff) | |
download | ffmpeg-038f3a173f59c9fc3396aa38e7972661da7ca504.tar.gz |
avformat/concatdec: avoid NULL dereference when failed to open file.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r-- | libavformat/concatdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index e109524de1..f07cfd7e8f 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -482,6 +482,9 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) ConcatStream *cs; AVStream *st; + if (!cat->avf) + return AVERROR(EIO); + while (1) { ret = av_read_frame(cat->avf, pkt); if (ret == AVERROR_EOF) { |