[FFmpeg-devel] [PATCH 1/2] avcodec/dovi_rpudec: add return code to parse_ext_v*

[FFmpeg-devel] [PATCH 1/2] avcodec/dovi_rpudec: add return code to parse_ext_v*

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

---
 libavcodec/dovi_rpudec.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c
index a477dbd4e3..fc3b0a2b82 100644
--- a/libavcodec/dovi_rpudec.c
+++ b/libavcodec/dovi_rpudec.c
@@ -127,7 +127,7 @@ static inline unsigned get_variable_bits(GetBitContext *gb, int n)
         }                                                                       \
     } while (0)
 
-static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm)
+static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm)
 {
     switch (dm->level) {
     case 1:
@@ -170,6 +170,8 @@ static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm)
         av_log(s->logctx, AV_LOG_WARNING,
                "Unknown Dolby Vision DM v1 level: %u\n", dm->level);
     }
+
+    return 0;
 }
 
 static AVCIExy get_cie_xy(GetBitContext *gb)
@@ -181,8 +183,8 @@ static AVCIExy get_cie_xy(GetBitContext *gb)
     return xy;
 }
 
-static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm,
-                         int ext_block_length)
+static int parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm,
+                        int ext_block_length)
 {
     switch (dm->level) {
     case 3:
@@ -254,11 +256,13 @@ static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm,
         av_log(s->logctx, AV_LOG_WARNING,
                "Unknown Dolby Vision DM v2 level: %u\n", dm->level);
     }
+
+    return 0;
 }
 
 static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver)
 {
-    int num_ext_blocks, ext_block_length, start_pos, parsed_bits;
+    int num_ext_blocks, ext_block_length, start_pos, parsed_bits, ret;
 
     num_ext_blocks = get_ue_golomb_31(gb);
     align_get_bits(gb);
@@ -278,10 +282,14 @@ static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver)
         start_pos = get_bits_count(gb);
 
         switch (ver) {
-        case 1: parse_ext_v1(s, gb, dm); break;
-        case 2: parse_ext_v2(s, gb, dm, ext_block_length); break;
+        case 1: ret = parse_ext_v1(s, gb, dm); break;
+        case 2: ret = parse_ext_v2(s, gb, dm, ext_block_length); break;
+        default: return AVERROR_BUG;
         }
 
+        if (ret < 0)
+            return ret;
+
         parsed_bits = get_bits_count(gb) - start_pos;
         if (parsed_bits > ext_block_length * 8)
             return AVERROR_INVALIDDATA;
-- 
2.45.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] avcodec/dovi_rpudec: validate L2.ms_weight

[Niklas Haas]

From: Niklas Haas <git@haasn.dev>

This is specified to be in the range -1 to 4095, apparently the only
extension level with such a restriction.
---
 libavcodec/dovi_rpudec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c
index fc3b0a2b82..306efbb31f 100644
--- a/libavcodec/dovi_rpudec.c
+++ b/libavcodec/dovi_rpudec.c
@@ -143,6 +143,7 @@ static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm)
         dm->l2.trim_chroma_weight = get_bits(gb, 12);
         dm->l2.trim_saturation_gain = get_bits(gb, 12);
         dm->l2.ms_weight = get_sbits(gb, 13);
+        VALIDATE(dm->l2.ms_weight, -1, 4095);
         break;
     case 4:
         dm->l4.anchor_pq = get_bits(gb, 12);
@@ -172,6 +173,9 @@ static int parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm)
     }
 
     return 0;
+
+fail:
+    return AVERROR_INVALIDDATA;
 }
 
 static AVCIExy get_cie_xy(GetBitContext *gb)
-- 
2.45.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".