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

mkvparser: s/LONG_LONG_MAX/LLONG_MAX/ for compatibility

Browse Source 
Change-Id: If3b80bfd08f02ec9cba0be223ff95991564f6fd7
This commit is contained in:
James Zern 2015-09-11 15:45:38 -07:00
parent bff1aa512d
commit f1a99d5f25
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mkvparser.cpp
View File

@ -374,10 +374,10 @@ long ParseElementHeader(IMkvReader* pReader, long long& pos,
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
} }
// Avoid rolling over pos when very close to LONG_LONG_MAX. // Avoid rolling over pos when very close to LLONG_MAX.
const unsigned long long rollover_check = const unsigned long long rollover_check =
static_cast<unsigned long long>(pos) + len; static_cast<unsigned long long>(pos) + len;
if (rollover_check > LONG_LONG_MAX) if (rollover_check > LLONG_MAX)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
pos += len; // consume length of size pos += len; // consume length of size
@ -456,13 +456,13 @@ bool Match(IMkvReader* pReader, long long& pos, unsigned long expected_id,
unsigned long long rollover_check = unsigned long long rollover_check =
static_cast<unsigned long long>(pos) + len; static_cast<unsigned long long>(pos) + len;
if (rollover_check > LONG_LONG_MAX) if (rollover_check > LLONG_MAX)
return false; return false;
pos += len; // consume length of size of payload pos += len; // consume length of size of payload
rollover_check = static_cast<unsigned long long>(pos) + size; rollover_check = static_cast<unsigned long long>(pos) + size;
if (rollover_check > LONG_LONG_MAX) if (rollover_check > LLONG_MAX)
return false; return false;
if ((pos + size) > available) if ((pos + size) > available)
@ -845,9 +845,9 @@ long long Segment::ParseHeaders() {
long long pos = m_pos; long long pos = m_pos;
const long long element_start = pos; const long long element_start = pos;
// Avoid rolling over pos when very close to LONG_LONG_MAX. // Avoid rolling over pos when very close to LLONG_MAX.
unsigned long long rollover_check = pos + 1ULL; unsigned long long rollover_check = pos + 1ULL;
if (rollover_check > LONG_LONG_MAX) if (rollover_check > LLONG_MAX)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
if ((pos + 1) > available) if ((pos + 1) > available)
@ -911,9 +911,9 @@ long long Segment::ParseHeaders() {
pos += len; // consume length of size of element pos += len; // consume length of size of element
// Avoid rolling over pos when very close to LONG_LONG_MAX. // Avoid rolling over pos when very close to LLONG_MAX.
rollover_check = static_cast<unsigned long long>(pos) + size; rollover_check = static_cast<unsigned long long>(pos) + size;
if (rollover_check > LONG_LONG_MAX) if (rollover_check > LLONG_MAX)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
const long long element_size = size + pos - element_start; const long long element_size = size + pos - element_start;
@ -4033,7 +4033,7 @@ long SegmentInfo::Parse() {
} }
const double rollover_check = m_duration * m_timecodeScale; const double rollover_check = m_duration * m_timecodeScale;
if (rollover_check > LONG_LONG_MAX) if (rollover_check > LLONG_MAX)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
if (pos != stop) if (pos != stop)