[FFmpeg-devel] [PATCH] avcodec/fflcms2: Don't access inexistent array elements (PR #20780)

[mkver via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20780 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20780
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20780.patch

This would happen if one of the extended transfer characteristics is in
use (currently only AVCOL_TRC_V_LOG).

This issue has actually been pointed out in the review.


>From 0941646182ba59daa452885f508b87bef2090e46 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Tue, 28 Oct 2025 21:40:50 +0100
Subject: [PATCH] avcodec/fflcms2: Don't access inexistent array elements

This would happen if one of the extended transfer characteristics is in
use (currently only AVCOL_TRC_V_LOG).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/fflcms2.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/fflcms2.c b/libavcodec/fflcms2.c
index c7b944a02f..3c7f3dc07f 100644
--- a/libavcodec/fflcms2.c
+++ b/libavcodec/fflcms2.c
@@ -50,10 +50,7 @@ void ff_icc_context_uninit(FFIccContext *s)
 static int get_curve(FFIccContext *s, enum AVColorTransferCharacteristic trc,
                      cmsToneCurve **out_curve)
 {
-    if ((trc >= AVCOL_TRC_NB && trc < AVCOL_TRC_EXT_BASE) || trc >= AVCOL_TRC_EXT_NB)
-        return AVERROR_INVALIDDATA;
-
-    if (s->curves[trc])
+    if ((unsigned)trc < AVCOL_TRC_NB && s->curves[trc])
         goto done;
 
     switch (trc) {
-- 
2.49.1

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