generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkvparser/Tracks: convert asserts to failure returns

Browse Source 
BUG=23431751

Change-Id: Ife6190a4bcd4ab949165f17fd0b6c26a058a661b
This commit is contained in:
James Zern
2015-08-21 19:50:01 -07:00
parent 5889e6c18b
commit 680b4bfd3d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mkvparser.cpp
View File

@@ -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;