mkvparser: Segment::Load asserts to error checks.

Change-Id: Ia47a24786789d6f94a786f76e313318e013f4f40
2015-08-31 13:38:35 -07:00
parent d0313dd7ce
commit 27a07c1fd1
1 changed files with 2 additions and 4 deletions
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -1390,10 +1390,8 @@ bool Segment::PreloadCluster(Cluster* pCluster, ptrdiff_t idx) {
 }

 long Segment::Load() {
-  assert(m_clusters == NULL);
-  assert(m_clusterSize == 0);
-  assert(m_clusterCount == 0);
-  // assert(m_size >= 0);
+  if (m_clusters != NULL || m_clusterSize != 0 || m_clusterCount != 0)
+    return E_PARSE_FAILED;

  // Outermost (level 0) segment object has been constructed,
  // and pos designates start of payload.  We need to find the