From 680b4bfd3dfb1ff3c7cfdd70cfde33aa70610d5b Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Fri, 21 Aug 2015 19:50:01 -0700
Subject: [PATCH] mkvparser/Tracks: convert asserts to failure returns

BUG=23431751

Change-Id: Ife6190a4bcd4ab949165f17fd0b6c26a058a661b
---
 mkvparser.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mkvparser.cpp b/mkvparser.cpp
index 1ffa053..8e685a4 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -5271,10 +5271,12 @@ long Tracks::Parse() {
       ++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;
 
   if (count <= 0)
     return 0;  // success
@@ -5493,10 +5495,12 @@ long Tracks::ParseTrackEntry(long long track_start, long long track_size,
     }
 
     pos += size;  // consume payload
-    assert(pos <= track_stop);
+    if (pos > track_stop)
+      return E_FILE_FORMAT_INVALID;
   }
 
-  assert(pos == track_stop);
+  if (pos != track_stop)
+    return E_FILE_FORMAT_INVALID;
 
   if (info.number <= 0)  // not specified
     return E_FILE_FORMAT_INVALID;