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

mkvparser: Avoid crash when encountering a Colour element.

Browse Source 
Change-Id: Iadf55bf2a7cd5535a8c2309c2d8cb6c834d30aee
This commit is contained in:
Tom Finegan
2016-02-11 14:11:50 -08:00
parent a1517aa526
commit 1dab7f34ff
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mkvparser.cpp
View File

@@ -5207,6 +5207,8 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
const long long stop = pos + s.size; const long long stop = pos + s.size;
Colour* colour = NULL;
while (pos < stop) { while (pos < stop) {
long long id, size; long long id, size;
@@ -5254,7 +5256,7 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
if (rate <= 0) if (rate <= 0)
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
} else if (id == mkvmuxer::kMkvColour) { } else if (id == mkvmuxer::kMkvColour) {
if (!Colour::Parse(pReader, pos, size, &pResult->m_colour)) if (!Colour::Parse(pReader, pos, size, &colour))
return E_FILE_FORMAT_INVALID; return E_FILE_FORMAT_INVALID;
} }
@@ -5286,6 +5288,7 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
pTrack->m_display_unit = display_unit; pTrack->m_display_unit = display_unit;
pTrack->m_stereo_mode = stereo_mode; pTrack->m_stereo_mode = stereo_mode;
pTrack->m_rate = rate; pTrack->m_rate = rate;
pTrack->m_colour = colour;
pResult = pTrack; pResult = pTrack;
return 0; // success return 0; // success