RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/iamf_parse: ignore Audio Elements with an unsupported type 

Better fix for the NULL pointer dereference from d7f83fc2f4.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-08-14 13:46:53 -03:00
parent 9880fea930
commit 66c05dc031
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/iamf_parse.c
View File

@ -636,6 +636,12 @@ static int audio_element_obu(void *s, IAMFContext *c, AVIOContext *pb, int len)
}
audio_element_type = avio_r8(pbc) >> 5;
if (audio_element_type > AV_IAMF_AUDIO_ELEMENT_TYPE_SCENE) {
av_log(s, AV_LOG_DEBUG, "Unknown audio_element_type referenced in an audio element. Ignoring\n");
ret = 0;
goto fail;
}
codec_config_id = ffio_read_leb(pbc);
codec_config = ff_iamf_get_codec_config(c, codec_config_id);
@ -751,8 +757,7 @@ static int audio_element_obu(void *s, IAMFContext *c, AVIOContext *pb, int len)
if (ret < 0)
goto fail;
} else {
unsigned audio_element_config_size = ffio_read_leb(pbc);
avio_skip(pbc, audio_element_config_size);
av_assert0(0);
}
c->audio_elements[c->nb_audio_elements++] = audio_element;

2
libavformat/iamfdec.c
View File

@ -107,7 +107,7 @@ static int iamf_read_header(AVFormatContext *s)
if (ret < 0)
return ret;
if (!i && !j && audio_element->nb_layers && audio_element->layers[0].substream_count == 1)
if (!i && !j && audio_element->layers[0].substream_count == 1)
st->disposition |= AV_DISPOSITION_DEFAULT;
else
st->disposition |= AV_DISPOSITION_DEPENDENT;