[FFmpeg-cvslog] lavf: check stream_index from read_packet() for validity.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 12 01:04:12 2011 +0200| [d69fda9127986dc56a5f1bbc00e7a9d72305d573] | committer: Michael Niedermayer

lavf: check stream_index from read_packet() for validity.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d69fda9127986dc56a5f1bbc00e7a9d72305d573
---

 libavformat/utils.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d98a17a..5898295 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){