ffmpeg | branch: release/7.0 | James Almer <jamr...@gmail.com> | Wed Aug 14 13:46:53 2024 -0300| [5ba8efe90bf9a826f30227e8af260580aeb92b4e] | committer: James Almer
avformat/iamf_parse: ignore Audio Elements with an unsupported type Better fix for the NULL pointer dereference from d7f83fc2f423. Signed-off-by: James Almer <jamr...@gmail.com> (cherry picked from commit 66c05dc03163998fb9a90ebd53e2c39a4f95b7ea) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ba8efe90bf9a826f30227e8af260580aeb92b4e --- libavformat/iamf_parse.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index a222a46c86..af19b31e70 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
