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

Signal E_BUFFER_NOT_FULL in EBMLHeader::Parse

Browse Source 
When trying to read the ebml id, signal E_BUFFER_NOT_FULL if it
occurs rather than returning E_FILE_FORMAT_INVALID (helps in case
of incremental parsing). Makes this return path consistent with
other return paths in the function.

Change-Id: I4b6ce3f0ba856959fa97f0f6ffb61994f3f2ffc6
This commit is contained in:
Vignesh Venkatasubramanian
2016-02-08 16:10:50 -08:00
parent fb1406ec3b
commit 939a64dc2d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mkvparser.cpp
View File

@@ -544,6 +544,9 @@ long long EBMLHeader::Parse(IMkvReader* pReader, long long& pos) {
long len = 0; long len = 0;
const long long ebml_id = ReadID(pReader, pos, len); const long long ebml_id = ReadID(pReader, pos, len);
if (ebml_id == E_BUFFER_NOT_FULL)
return E_BUFFER_NOT_FULL;
// TODO(tomfinegan): Move Matroska ID constants into a common namespace. // TODO(tomfinegan): Move Matroska ID constants into a common namespace.
if (len != 4 || ebml_id != mkvmuxer::kMkvEBML) if (len != 4 || ebml_id != mkvmuxer::kMkvEBML)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;