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

mkvparser: Cluster::Create clean up.

Browse Source 
- Asserts to error condition check and return.
- Use nothrow new.

Change-Id: Iff9da5806e6f3240e7ea9f9e90ccdf729848a778
This commit is contained in:
Tom Finegan
2015-08-24 14:56:35 -07:00
parent 064f2eed62
commit 275ac22cae
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mkvparser.cpp
View File

@@ -6413,15 +6413,14 @@ long Cluster::GetEntry(long index, const mkvparser::BlockEntry*& pEntry) const {
return E_BUFFER_NOT_FULL; // underflow, since more remains to be parsed return E_BUFFER_NOT_FULL; // underflow, since more remains to be parsed
} }
Cluster* Cluster::Create(Segment* pSegment, long idx, long long off) Cluster* Cluster::Create(Segment* pSegment, long idx, long long off) {
// long long element_size) if (!pSegment || off < 0)
{ return NULL;
assert(pSegment);
assert(off >= 0);
const long long element_start = pSegment->m_start + off; const long long element_start = pSegment->m_start + off;
Cluster* const pCluster = new Cluster(pSegment, idx, element_start); Cluster* const pCluster =
new (std::nothrow) Cluster(pSegment, idx, element_start);
return pCluster; return pCluster;
} }