From: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed, 28 Sep 2016 14:14:08 +0000 (+0200)
Subject: avformat/avidec: Check nb_streams in read_gab2_sub()
X-Git-Tag: android-x86-7.1-r1~3680
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2679ad4773aa356e7c3da5c68bc81f02a194617f;p=android-x86%2Fexternal-ffmpeg.git

avformat/avidec: Check nb_streams in read_gab2_sub()

Fixes null pointer dereference
Fixes: 1/null_point.avi

Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 96edfa88ea..2c81267e12 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1101,6 +1101,8 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt)
             goto error;
 
         if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) {
+            if (ast->sub_ctx->nb_streams != 1)
+                goto error;
             ff_read_packet(ast->sub_ctx, &ast->sub_pkt);
             avcodec_parameters_copy(st->codecpar, ast->sub_ctx->streams[0]->codecpar);
             time_base = ast->sub_ctx->streams[0]->time_base;