diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-15 02:43:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 21:52:50 +0100 |
| commit | 8454d81ebe672e33022bc06e461676ca6d7b3299 (patch) | |
| tree | b8da4d6fa7b3048c23a605c35f7b817cb1955e56 | |
| parent | 6f0e349a023c9690ef21a94ac5eb8451cf1cce95 (diff) | |
| download | ffmpeg-8454d81ebe672e33022bc06e461676ca6d7b3299.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 89e2502e0d..680db1e5a6 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -342,6 +342,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; |