MSE: Give decode error if MDAT discard peek fails

media/formats/mp4/mp4_stream_parser.cc

 // Copyright 2014 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/formats/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 534 matching lines @@
   audio_buffers->clear();
   video_buffers->clear();
   return success;
 }
 
 bool MP4StreamParser::ReadAndDiscardMDATsUntil(const int64 offset) {
   bool err = false;
   while (mdat_tail_ < offset) {
     const uint8* buf;
     int size;
     queue_.PeekAt(mdat_tail_, &buf, &size);

[DaleCurtis, 2014/06/19 00:58:20]

drive-by:  the above vars should be zero-initialized since this method doesn't
return a value.

[wolenetz, 2014/06/19 01:21:31]

Good point. Done.

+    if (!buf)

[acolwell GONE FROM CHROMIUM, 2014/06/19 00:57:03]

nit: s/!buf/size == 0/ since all the other PeekAt() callers check size?

[wolenetz, 2014/06/19 01:21:31]

Done (size <= 0)

+      return false;
 
     FourCC type;
     int box_sz;
     if (!BoxReader::StartTopLevelBox(buf, size, log_cb_,
                                      &type, &box_sz, &err))
       break;
 
     if (type != FOURCC_MDAT) {
       MEDIA_LOG(log_cb_) << "Unexpected box type while parsing MDATs: "
                          << FourCCToString(type);
     }
     mdat_tail_ += box_sz;
   }
   queue_.Trim(std::min(mdat_tail_, offset));
   return !err;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media