From fa2aa7da2d882cabaf792e2cb2216b4377ebd091 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Fri, 21 Aug 2015 17:01:32 -0700
Subject: [PATCH] SeekHead::Parse(): fix assertion failure

replace assertions with failure returns

BUG=23430787
BUG=23431751

Change-Id: I22f000388cf040d064ba898c5de3658b56a3dfea
---
 mkvparser.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mkvparser.cpp b/mkvparser.cpp
index 3201315..061dc33 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -1453,10 +1453,13 @@ long SeekHead::Parse() {
       ++void_element_count;
 
     pos += size;  // consume payload
-    assert(pos <= stop);
+
+    if (pos > stop)
+      return E_FILE_FORMAT_INVALID;
   }
 
-  assert(pos == stop);
+  if (pos != stop)
+    return E_FILE_FORMAT_INVALID;
 
   m_entries = new (std::nothrow) Entry[entry_count];