Moved DCHECK() to prevent NULL deref of codec_context_.

media/filters/audio_file_reader.cc

 // Copyright (c) 2012 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 94 matching lines @@
   codec_ = NULL;
 
   if (format_context_) {
     avformat_close_input(&format_context_);
     format_context_ = NULL;
   }
 }
 
 bool AudioFileReader::Read(const std::vector<float*>& audio_data,
                            size_t number_of_frames) {
+  DCHECK(format_context_ && codec_context_ && codec_) <<
+      "AudioFileReader::Read() : reader is not opened!";
+
   size_t channels = this->channels();
   DCHECK_EQ(audio_data.size(), channels);
   if (audio_data.size() != channels)
     return false;
 
-  DCHECK(format_context_ && codec_context_ && codec_);
-  if (!format_context_ || !codec_context_ || !codec_) {
-    DLOG(WARNING) << "AudioFileReader::Read() : reader is not opened!";
-    return false;
-  }
-
   // Holds decoded audio.
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> av_frame(avcodec_alloc_frame());
 
   // Read until we hit EOF or we've read the requested number of frames.
   AVPacket packet;
   int result = 0;
   size_t current_frame = 0;
 
   while (current_frame < number_of_frames &&
          (result = av_read_frame(format_context_, &packet)) >= 0) {
@@ skipping 42 matching lines @@
       }
     }
 
     current_frame += frames_read;
   }
 
   return true;
 }
 
 }  // namespace media