Fix crash in AudioFileReader::Read() by checking for properly initialized AVCodec

media/filters/audio_file_reader.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/audio_file_reader.h"
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 73 matching lines @@
   av_find_stream_info(format_context_);
   codec_ = avcodec_find_decoder(codec_context_->codec_id);
   if (codec_) {
     if ((result = avcodec_open(codec_context_, codec_)) < 0) {
       DLOG(WARNING) << "AudioFileReader::Open() : could not open codec -"
           << " result: " << result;
       return false;
     }
 
     result = av_seek_frame(format_context_, 0, 0, 0);
+  } else {
+      DLOG(WARNING) << "AudioFileReader::Open() : could not find codec -"

[scherkus (not reviewing), 2011/08/30 20:25:33]

the indentation is wrong here -- could you TBR a patch fixing this?

+          << " result: " << result;
+      return false;
   }
 
   return true;
 }
 
 void AudioFileReader::Close() {
   if (codec_context_ && codec_)
     avcodec_close(codec_context_);
 
   codec_context_ = NULL;
   codec_ = NULL;
 
   if (format_context_) {
     av_close_input_file(format_context_);
     format_context_ = NULL;
   }
 }
 
 bool AudioFileReader::Read(const std::vector<float*>& audio_data,
                            size_t number_of_frames) {
   size_t channels = this->channels();
   DCHECK_EQ(audio_data.size(), channels);
   if (audio_data.size() != channels)
     return false;
 
-  DCHECK(format_context_ && codec_context_);
-  if (!format_context_ || !codec_context_) {
+  DCHECK(format_context_ && codec_context_ && codec_);
+  if (!format_context_ || !codec_context_ || !codec_) {
     DLOG(WARNING) << "AudioFileReader::Read() : reader is not opened!";
     return false;
   }
 
   scoped_ptr_malloc<int16, ScopedPtrAVFree> output_buffer(
       static_cast<int16*>(av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE)));
 
   // Read until we hit EOF or we've read the requested number of frames.
   AVPacket avpkt;
   av_init_packet(&avpkt);
@@ skipping 43 matching lines @@
       }
     }
 
     current_frame += frames_read;
   }
 
   return true;
 }
 
 }  // namespace media