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

Merge "UUIDs can have their high bit set"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian 2014-05-23 09:01:20 -07:00 committed by Gerrit Code Review
commit 568504e64e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mkvparser.cpp
View File

@ -130,6 +130,8 @@ long long mkvparser::GetUIntLength(IMkvReader* pReader, long long pos,
return 0; // success return 0; // success
} }
// TODO(vigneshv): This function assumes that unsigned values never have their
// high bit set.
long long mkvparser::UnserializeUInt(IMkvReader* pReader, long long pos, long long mkvparser::UnserializeUInt(IMkvReader* pReader, long long pos,
long long size) { long long size) {
assert(pReader); assert(pReader);
@ -4128,12 +4130,13 @@ long Chapters::Atom::Parse(IMkvReader* pReader, long long pos, long long size) {
if (status < 0) // error if (status < 0) // error
return status; return status;
} else if (id == 0x33C4) { // UID ID } else if (id == 0x33C4) { // UID ID
const long long val = UnserializeUInt(pReader, pos, size); long long val;
status = UnserializeInt(pReader, pos, size, val);
if (val < 0) // error if (val < 0) // error
return static_cast<long>(val); return status;
m_uid = val; m_uid = static_cast<unsigned long long>(val);
} else if (id == 0x11) { // TimeStart ID } else if (id == 0x11) { // TimeStart ID
const long long val = UnserializeUInt(pReader, pos, size); const long long val = UnserializeUInt(pReader, pos, size);