wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avformat/iamf_parse: ensure there's at most one of each parameter types in audio elements

Browse source 
Should prevent potential memory leaks on invalid files.

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 5470d024e1)
This commit is contained in:
James Almer 2025-02-17 11:41:25 -03:00
parent 695dcf29c2
commit e0e7c95a06
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libavformat/iamf_parse.c
View file

@ -752,11 +752,19 @@ static int audio_element_obu(void *s, IAMFContext *c, AVIOContext *pb, int len)
type = ffio_read_leb(pbc);
if (type == AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN)
ret = AVERROR_INVALIDDATA;
else if (type == AV_IAMF_PARAMETER_DEFINITION_DEMIXING)
else if (type == AV_IAMF_PARAMETER_DEFINITION_DEMIXING) {
if (element->demixing_info) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
ret = param_parse(s, c, pbc, type, audio_element, &element->demixing_info);
else if (type == AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN)
} else if (type == AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN) {
if (element->recon_gain_info) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
ret = param_parse(s, c, pbc, type, audio_element, &element->recon_gain_info);
else {
} else {
unsigned param_definition_size = ffio_read_leb(pbc);
avio_skip(pbc, param_definition_size);
}