Make sure that ffmpeg returning us an invalid stream cannot damage us too...

media/filters/ffmpeg_demuxer.cc

Index: media/filters/ffmpeg_demuxer.cc
===================================================================
--- media/filters/ffmpeg_demuxer.cc	(revision 65271)
+++ media/filters/ffmpeg_demuxer.cc	(working copy)
@@ -529,7 +529,12 @@
   // thread.
   DCHECK_GE(packet->stream_index, 0);
   DCHECK_LT(packet->stream_index, static_cast<int>(packet_streams_.size()));
-  FFmpegDemuxerStream* demuxer_stream = packet_streams_[packet->stream_index];
+  FFmpegDemuxerStream* demuxer_stream = NULL;
+  size_t i = packet->stream_index;

[fbarchard, 2010/11/08 15:55:47]

Why create a new variable (i)?
FFmpegDemuxerStream* demuxer_stream = NULL;
if (packet->stream_index < packet_streams_.size()) {
  demuxer_stream = packet_streams_[packet->stream_index];
}

+  // Defend against ffmpeg giving us a bad stream index.
+  if (i < packet_streams_.size()) {
+    demuxer_stream = packet_streams_[i];
+  }
   if (demuxer_stream) {
     // Queue the packet with the appropriate stream.  The stream takes
     // ownership of the AVPacket.