[FFmpeg-cvslog] r13224 - trunk/libavformat/ffm.c

[bcoudurier]

Author: bcoudurier
Date: Wed May 21 23:04:42 2008
New Revision: 13224

Log:
check pkt stream index before returning packet, prevent segfault

Modified:
   trunk/libavformat/ffm.c

Modified: trunk/libavformat/ffm.c
==============================================================================
--- trunk/libavformat/ffm.c	(original)
+++ trunk/libavformat/ffm.c	Wed May 21 23:04:42 2008
@@ -610,6 +610,12 @@ static int ffm_read_packet(AVFormatConte
 
         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;