浏览代码

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>
Andreas Rheinhardt 3 周之前
父节点
当前提交
0941646182
共有 1 个文件被更改,包括 1 次插入4 次删除
  1. 1 4
      libavcodec/fflcms2.c

+ 1 - 4
libavcodec/fflcms2.c

@@ -50,10 +50,7 @@ void ff_icc_context_uninit(FFIccContext *s)
 static int get_curve(FFIccContext *s, enum AVColorTransferCharacteristic trc,
 static int get_curve(FFIccContext *s, enum AVColorTransferCharacteristic trc,
                      cmsToneCurve **out_curve)
                      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;
         goto done;
 
 
     switch (trc) {
     switch (trc) {