From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 11 Oct 2011 23:04:12 +0000 (+0200)
Subject: lavf: check stream_index from read_packet() for validity.
X-Git-Tag: android-x86-4.4-r1~15617
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d69fda9127986dc56a5f1bbc00e7a9d72305d573;p=android-x86%2Fexternal-ffmpeg.git

lavf: check stream_index from read_packet() for validity.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d98a17aeda..58982955de 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -762,6 +762,11 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
         if(!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA))
             av_packet_merge_side_data(pkt);
 
+        if(pkt->stream_index >= (unsigned)s->nb_streams){
+            av_log(s, AV_LOG_ERROR, "Invalid stream index %d\n", pkt->stream_index);
+            continue;
+        }
+
         st= s->streams[pkt->stream_index];
 
         switch(st->codec->codec_type){