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

mkvparser/Track: convert asserts to failure returns

Browse Source 
Change-Id: Ibf37245f74e019c788b3f4121082956aa209430a
This commit is contained in:
James Zern 2015-08-21 19:49:32 -07:00
parent 5135c4cd74
commit 5889e6c18b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mkvparser.cpp
View File

@ -4867,7 +4867,8 @@ long Track::ParseContentEncodingsEntry(long long start, long long size) {
++count; ++count;
pos += size; // consume payload pos += size; // consume payload
assert(pos <= stop); if (pos > stop)
return E_FILE_FORMAT_INVALID;
} }
if (count <= 0) if (count <= 0)
@ -4903,10 +4904,12 @@ long Track::ParseContentEncodingsEntry(long long start, long long size) {
} }
pos += size; // consume payload 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;
return 0; return 0;
} }
@ -4999,10 +5002,12 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
} }
pos += size; // consume payload 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;
VideoTrack* const pTrack = VideoTrack* const pTrack =
new (std::nothrow) VideoTrack(pSegment, element_start, element_size); new (std::nothrow) VideoTrack(pSegment, element_start, element_size);
@ -5197,10 +5202,12 @@ long AudioTrack::Parse(Segment* pSegment, const Info& info,
} }
pos += size; // consume payload 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;
AudioTrack* const pTrack = AudioTrack* const pTrack =
new (std::nothrow) AudioTrack(pSegment, element_start, element_size); new (std::nothrow) AudioTrack(pSegment, element_start, element_size);