Code: long SeekHead::Parse()
{
    IMkvReader* const pReader = m_pSegment->m_pReader;
 
    long long pos = m_start;
    const long long stop = m_start + m_size;
 
 
    int entry_count = 0;
    int void_element_count = 0;
 
    while (pos < stop)
    {
        long long id, size;
 
        const long status = ParseElementHeader(
                                pReader,
                                pos,
                                stop,
                                id,
                                size);
 
        if (status < 0)  //error
            return status;
 
        if (id == 0x0DBB)  //SeekEntry ID
            ++entry_count;
        else if (id == 0x6C)  //Void ID
            ++void_element_count;
 
        pos += size;  //consume payload
        assert(pos <= stop);
     }
 
    assert(pos == stop);
 
    m_entries = new (std::nothrow) Entry[entry_count];
 
    if (m_entries == NULL)
        return -1;
 
    m_void_elements = new (std::nothrow) VoidElement[void_element_count];
 
    if (m_void_elements == NULL)
        return -1;
 
 
    Entry* pEntry = m_entries;
    VoidElement* pVoidElement = m_void_elements;
 
    pos = m_start;
 
    while (pos < stop)
    {
        const long long idpos = pos;
        long long id, size;
        const long status = ParseElementHeader(
                                pReader,
                                pos,
                                stop,
                                id,
                                size);
        if (status < 0)  //error
            return status;
        if (id == 0x0DBB)  //SeekEntry ID
        {
            if (ParseEntry(pReader, pos, size, pEntry))
            {
                Entry& e = *pEntry++;
                e.element_start = idpos;
                e.element_size = (pos + size) - idpos;
            }
        }
        else if (id == 0x6C)  //Void ID
        {
            VoidElement& e = *pVoidElement++;
            e.element_start = idpos;
            e.element_size = (pos + size) - idpos;
        }
        pos += size;  //consume payload
        assert(pos <= stop);
    }
    assert(pos == stop);
    ptrdiff_t count_ = ptrdiff_t(pEntry - m_entries);
    assert(count_ >= 0);
    assert(count_ <= entry_count);
    m_entry_count = static_cast<int>(count_);
    count_ = ptrdiff_t(pVoidElement - m_void_elements);
    assert(count_ >= 0);
    assert(count_ <= void_element_count);
    m_void_element_count = static_cast<int>(count_);
     return 0;
 }

Commit Message: libwebm: Pull from upstream

Rolling mkvparser from upstream. Primarily for fixing a bug on parsing
failures with certain Opus WebM files.

Upstream commit hash of this pull: 574045edd4ecbeb802ee3f1d214b5510269852ae

The diff is so huge because there were some style clean ups upstream.
But it was ensured that there were no breaking changes when the style
clean ups was done upstream.

Change-Id: Ib6e907175484b4b0ae1b55ab39522ea3188ad039
CWE ID: CWE-119
long SeekHead::Parse()
  long long pos = m_start;
  const long long stop = m_start + m_size;
 
  // first count the seek head entries
 
  int entry_count = 0;
  int void_element_count = 0;
 
  while (pos < stop) {
    long long id, size;
 
    const long status = ParseElementHeader(pReader, pos, stop, id, size);
 
    if (status < 0)  // error
      return status;
 
    if (id == 0x0DBB)  // SeekEntry ID
      ++entry_count;
    else if (id == 0x6C)  // Void ID
      ++void_element_count;
 
    pos += size;  // consume payload
    assert(pos <= stop);
  }
 
  assert(pos == stop);

  m_entries = new (std::nothrow) Entry[entry_count];

  if (m_entries == NULL)
    return -1;

  m_void_elements = new (std::nothrow) VoidElement[void_element_count];

  if (m_void_elements == NULL)
    return -1;

  // now parse the entries and void elements

  Entry* pEntry = m_entries;
  VoidElement* pVoidElement = m_void_elements;

  pos = m_start;

  while (pos < stop) {
    const long long idpos = pos;

    long long id, size;

    const long status = ParseElementHeader(pReader, pos, stop, id, size);

    if (status < 0)  // error
      return status;

    if (id == 0x0DBB) {  // SeekEntry ID
      if (ParseEntry(pReader, pos, size, pEntry)) {
        Entry& e = *pEntry++;

        e.element_start = idpos;
        e.element_size = (pos + size) - idpos;
      }
    } else if (id == 0x6C) {  // Void ID
      VoidElement& e = *pVoidElement++;

      e.element_start = idpos;
      e.element_size = (pos + size) - idpos;
     }
 
    pos += size;  // consume payload
    assert(pos <= stop);
  }
 
  assert(pos == stop);
 
  ptrdiff_t count_ = ptrdiff_t(pEntry - m_entries);
  assert(count_ >= 0);
  assert(count_ <= entry_count);
 
  m_entry_count = static_cast<int>(count_);
 
  count_ = ptrdiff_t(pVoidElement - m_void_elements);
  assert(count_ >= 0);
  assert(count_ <= void_element_count);
 
  m_void_element_count = static_cast<int>(count_);
 
  return 0;
}
 
int SeekHead::GetCount() const { return m_entry_count; }
 
const SeekHead::Entry* SeekHead::GetEntry(int idx) const {
  if (idx < 0)
     return 0;

  if (idx >= m_entry_count)
    return 0;

  return m_entries + idx;
 }
