[FFmpeg-devel] [PATCH] avcodec/aom_film_grain: fix AVCOL_*_NB range check (PR #20577)

[Niklas Haas via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20577 opened by Niklas Haas (haasn)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20577
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20577.patch

These should also exclude the _NB values themselves.


>From 025b89018fc8a9d9e457a0c102101fd9bf01fa3e Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@haasn.dev>
Date: Mon, 22 Sep 2025 17:14:45 +0200
Subject: [PATCH] avcodec/aom_film_grain: fix AVCOL_*_NB range check

These should also exclude the _NB values themselves.
---
 libavcodec/aom_film_grain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c
index 0f24a2bcf8..bd9647afe9 100644
--- a/libavcodec/aom_film_grain.c
+++ b/libavcodec/aom_film_grain.c
@@ -199,13 +199,13 @@ int ff_aom_parse_film_grain_sets(AVFilmGrainAFGS1Params *s,
                 fgp->color_trc = get_bits(gb, 8);
                 fgp->color_space = get_bits(gb, 8);
                 fgp->color_range = get_bits1(gb) ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
-                if (fgp->color_primaries > AVCOL_PRI_NB ||
+                if (fgp->color_primaries >= AVCOL_PRI_NB ||
                     fgp->color_primaries == AVCOL_PRI_RESERVED ||
                     fgp->color_primaries == AVCOL_PRI_RESERVED0 ||
-                    fgp->color_trc > AVCOL_TRC_NB ||
+                    fgp->color_trc >= AVCOL_TRC_NB ||
                     fgp->color_trc == AVCOL_TRC_RESERVED ||
                     fgp->color_trc == AVCOL_TRC_RESERVED0 ||
-                    fgp->color_space > AVCOL_SPC_NB ||
+                    fgp->color_space >= AVCOL_SPC_NB ||
                     fgp->color_space == AVCOL_SPC_RESERVED)
                     goto error;
             }
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org