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

mkvparser/Cues: convert asserts to failure returns

Browse Source 
Change-Id: I88b5dfecfd03fec7f5808959ec6f640bff838d7a
This commit is contained in:
James Zern
2015-08-21 19:48:17 -07:00
parent db3f9bbd79
commit b0e4f32011
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mkvparser.cpp
View File

@@ -1903,7 +1903,8 @@ bool Cues::LoadCuePoint() const {
if (id != 0x3B) { // CuePoint ID if (id != 0x3B) { // CuePoint ID
m_pos += size; // consume payload m_pos += size; // consume payload
assert(m_pos <= stop); if (m_pos > stop)
return false;
continue; continue;
} }
@@ -1924,7 +1925,8 @@ bool Cues::LoadCuePoint() const {
--m_preload_count; --m_preload_count;
m_pos += size; // consume payload m_pos += size; // consume payload
assert(m_pos <= stop); if (m_pos > stop)
return false;
return true; // yes, we loaded a cue point return true; // yes, we loaded a cue point
} }
@@ -2303,7 +2305,8 @@ bool CuePoint::Load(IMkvReader* pReader) {
} }
pos += size; // consume payload pos += size; // consume payload
assert(pos <= stop); if (pos > stop)
return false;
} }
assert(size_t(p - m_track_positions) == m_track_positions_count); assert(size_t(p - m_track_positions) == m_track_positions_count);