[FFmpeg-devel] [PATCH 1/2] avformat/iamf_parse: add missing constrains for num_parameters in audio_element_oub()

[FFmpeg-devel] [PATCH 1/2] avformat/iamf_parse: add missing constrains for num_parameters in audio_element_oub()

[James Almer]

Fixes ticket #11475.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/iamf_parse.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index 316093b35f..f71ea5315b 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -733,6 +733,12 @@ static int audio_element_obu(void *s, IAMFContext *c, AVIOContext *pb, int len)
     }
 
     num_parameters = ffio_read_leb(pbc);
+    if (num_parameters > 2 && audio_element_type == 0) {
+        av_log(s, AV_LOG_ERROR, "Audio Element parameter count %u is invalid"
+                                " for Channel representations\n", num_parameters);
+        ret = AVERROR_INVALIDDATA;
+        goto fail;
+    }
     if (num_parameters && audio_element_type != 0) {
         av_log(s, AV_LOG_ERROR, "Audio Element parameter count %u is invalid"
                                 " for Scene representations\n", num_parameters);
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avformat/iamf_parse: ensure there's at most one of each parameter types in audio elements

[James Almer]

Should prevent potential memory leaks on invalid files.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/iamf_parse.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
index f71ea5315b..db40ae37ab 100644
--- a/libavformat/iamf_parse.c
+++ b/libavformat/iamf_parse.c
@@ -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);
         }
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".