check pkt stream index before returning packet, prevent segfault

Originally committed as revision 13224 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/ffm.c b/libavformat/ffm.c
index 872e6f0..bb2ee4b 100644 (file)
--- a/libavformat/ffm.c
+++ b/libavformat/ffm.c
@@ -610,6 +610,12 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket *pkt)
 
         av_new_packet(pkt, size);
         pkt->stream_index = ffm->header[0];
+        if ((unsigned)pkt->stream_index >= s->nb_streams) {
+            av_log(s, AV_LOG_ERROR, "invalid stream index %d\n", pkt->stream_index);
+            av_free_packet(pkt);
+            ffm->read_state = READ_HEADER;
+            return AVERROR(EAGAIN);
+        }
         pkt->pos = url_ftell(s->pb);
         if (ffm->header[1] & FLAG_KEY_FRAME)
             pkt->flags |= PKT_FLAG_KEY;