diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-15 02:43:03 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-03 18:17:26 +0100 |
commit | b6c19c9c918aee09d28606df4fe0481f96bc3695 (patch) | |
tree | bacfa18dc666e945f90bc2dd2126e819dca8b237 | |
parent | e8bd1af0950de54ea33bbcf46766ad4633f263d9 (diff) | |
download | ffmpeg-b6c19c9c918aee09d28606df4fe0481f96bc3695.tar.gz |
h264: check chroma_format_idc range.
Fixes Ticket758
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7fff64e00d886fde11d61958888c82b461cf99b9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 3184cadb21..f87957673d 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -347,6 +347,10 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ if(sps->profile_idc >= 100){ //high profile sps->chroma_format_idc= get_ue_golomb_31(&s->gb); + if (sps->chroma_format_idc > 3U) { + av_log(h->s.avctx, AV_LOG_ERROR, "chroma_format_idc %d is illegal\n", sps->chroma_format_idc); + goto fail; + } if(sps->chroma_format_idc == 3) sps->residual_color_transform_flag = get_bits1(&s->gb); sps->bit_depth_luma = get_ue_golomb(&s->gb) + 8; |