From 27a07c1fd12cd066180e265e786e9ebedcf7a544 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Mon, 31 Aug 2015 13:38:35 -0700 Subject: [PATCH] mkvparser: Segment::Load asserts to error checks. Change-Id: Ia47a24786789d6f94a786f76e313318e013f4f40 --- mkvparser.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mkvparser.cpp b/mkvparser.cpp index adffa98..9a08f93 100644 --- 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