[FFmpeg-devel] [PATCH 3/3] mpeg12dec: validate color transfer characteristics

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Fri Dec 23 01:59:06 EET 2016


Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavcodec/mpeg12dec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 89aecd4de4..964f498f3b 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1473,6 +1473,10 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
             s->avctx->color_primaries = AVCOL_PRI_UNSPECIFIED;
         }
         s->avctx->color_trc       = get_bits(&s->gb, 8);
+        if (!av_color_transfer_name(s->avctx->color_trc)) {
+            av_log(s->avctx, AV_LOG_WARNING, "Invalid color transfer characteristics %d, setting to unspecified\n", s->avctx->color_trc);
+            s->avctx->color_trc = AVCOL_TRC_UNSPECIFIED;
+        }
         s->avctx->colorspace      = get_bits(&s->gb, 8);
         if (!av_color_space_name(s->avctx->colorspace)) {
             av_log(s->avctx, AV_LOG_WARNING, "Invalid color space %d, setting to unspecified\n", s->avctx->colorspace);
-- 
2.11.0



More information about the ffmpeg-devel mailing list