Skip to content

demux/demux_mkv: bound num_headers read in parse_vorbis_chmap #18101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
uwezkhan wants to merge 1 commit into from
Closed

demux/demux_mkv: bound num_headers read in parse_vorbis_chmap #18101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion demux/demux_mkv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,10 +1819,12 @@ static void parse_vorbis_chmap(struct mp_chmap *channels, unsigned char *data,
if (size < 4)
return;
uint32_t vendor_length = AV_RL32(data);
if (vendor_length + 4 > size) // also check for the next AV_RB32 below
if (vendor_length + 4 > size)
return;
size -= vendor_length + 4;
data += vendor_length + 4;
if (size < 4)
return;
uint32_t num_headers = AV_RL32(data);
size -= 4;
data += 4;
Expand Down
Loading