demux/demux_mkv: bound num_headers read in parse_vorbis_chmap#18101
Closed
uwezkhan wants to merge 1 commit into
Closed
demux/demux_mkv: bound num_headers read in parse_vorbis_chmap#18101uwezkhan wants to merge 1 commit into
uwezkhan wants to merge 1 commit into
Conversation
Contributor
|
Duplicate of #17930 Sorry promptboy, somebody else's CV will have that one on it. Better luck next time! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
parse_vorbis_chmap() validates that the buffer holds the 4-byte vendor length plus the vendor string, then skips both and reads a 4-byte header count with AV_RL32. The earlier check never accounts for those last 4 bytes, so a FLAC CodecPrivate whose VorbisComment block is exactly vendor_length + 4 bytes long reads four bytes past the block.
Add the same size < 4 guard the per-header loop right below already uses, before the count read. Before, the function leaned on the vendor-string check to cover a field it never measured; after, every read stays inside the size the block reader passed in. The FLAC metadata size is known only at this layer, so the bound belongs here and not in the caller.