1. ffmpeg
  2. Commit 93f30f825c08477fe8f76be00539e96014cc83c8
Browse code

avcodec/hevc_ps: Check chroma_format_idc

Fixes out of array access
Fixes: 24d05e8b84676799c735c9e27d97895e/asan_heap-oob_1b70f6a_2955_7c3652a7f370f9f3ef40642bc2c99bb2.bit

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2015/11/05 22:52:33
Showing 1 changed files
libavcodec/hevc_ps.c
History View file @ 93f30f8
... ... 
@@ -834,6 +834,10 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id,
834 834 
     }
835 835
836 836 
     sps->chroma_format_idc = get_ue_golomb_long(gb);
837 
+    if (sps->chroma_format_idc > 3U) {
838 
+        av_log(avctx, AV_LOG_ERROR, "chroma_format_idc %d is invalid\n", sps->chroma_format_idc);
839 
+        return AVERROR_INVALIDDATA;
840 
+    }
837 841
838 842 
     if (sps->chroma_format_idc == 3)
839 843 
         sps->separate_colour_plane_flag = get_bits1(gb);