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

Change assertions to checks when parsing TrackPositions

Browse Source 
Malformed files woudl cause the parser to assert.

Instead now it stops parsing and skips the segment.

Change-Id: I256b3b72e43f969693ae16547ca98da07d665e21
This commit is contained in:
Leonel Togniolli 2015-04-18 22:14:12 +01:00 committed by James Zern
parent d04580fda5
commit 2cb6a28b09
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mkvparser.cpp
View File

@ -2237,7 +2237,9 @@ bool CuePoint::Load(IMkvReader* pReader) {
if (id == 0x37) { // CueTrackPosition(s) ID if (id == 0x37) { // CueTrackPosition(s) ID
TrackPosition& tp = *p++; TrackPosition& tp = *p++;
tp.Parse(pReader, pos, size); if (!tp.Parse(pReader, pos, size)) {
return false;
}
} }
pos += size; // consume payload pos += size; // consume payload
@ -2252,7 +2254,7 @@ bool CuePoint::Load(IMkvReader* pReader) {
return true; return true;
} }
void CuePoint::TrackPosition::Parse(IMkvReader* pReader, long long start_, bool CuePoint::TrackPosition::Parse(IMkvReader* pReader, long long start_,
long long size_) { long long size_) {
const long long stop = start_ + size_; const long long stop = start_ + size_;
long long pos = start_; long long pos = start_;
@ -2265,17 +2267,21 @@ void CuePoint::TrackPosition::Parse(IMkvReader* pReader, long long start_,
long len; long len;
const long long id = ReadUInt(pReader, pos, len); const long long id = ReadUInt(pReader, pos, len);
assert(id >= 0); // TODO if ((id < 0) || ((pos + len) > stop)) {
assert((pos + len) <= stop); return false;
}
pos += len; // consume ID pos += len; // consume ID
const long long size = ReadUInt(pReader, pos, len); const long long size = ReadUInt(pReader, pos, len);
assert(size >= 0); if ((size < 0) || ((pos + len) > stop)) {
assert((pos + len) <= stop); return false;
}
pos += len; // consume Size field pos += len; // consume Size field
assert((pos + size) <= stop); if ((pos + size) > stop) {
return false;
}
if (id == 0x77) // CueTrack ID if (id == 0x77) // CueTrack ID
m_track = UnserializeUInt(pReader, pos, size); m_track = UnserializeUInt(pReader, pos, size);
@ -2287,12 +2293,13 @@ void CuePoint::TrackPosition::Parse(IMkvReader* pReader, long long start_,
m_block = UnserializeUInt(pReader, pos, size); m_block = UnserializeUInt(pReader, pos, size);
pos += size; // consume payload pos += size; // consume payload
assert(pos <= stop);
} }
assert(m_pos >= 0); if ((m_pos < 0) || (m_track <= 0)) {
assert(m_track > 0); return false;
// assert(m_block > 0); }
return true;
} }
const CuePoint::TrackPosition* CuePoint::Find(const Track* pTrack) const { const CuePoint::TrackPosition* CuePoint::Find(const Track* pTrack) const {

2
mkvparser.hpp
View File

@ -704,7 +704,7 @@ class CuePoint {
// reference = clusters containing req'd referenced blocks // reference = clusters containing req'd referenced blocks
// reftime = timecode of the referenced block // reftime = timecode of the referenced block
void Parse(IMkvReader*, long long, long long); bool Parse(IMkvReader*, long long, long long);
}; };
const TrackPosition* Find(const Track*) const; const TrackPosition* Find(const Track*) const;