summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_ps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-15 02:43:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-15 02:43:03 +0100
commit7fff64e00d886fde11d61958888c82b461cf99b9 (patch)
tree208fe66bf830c8f12e579a1ce09cce331983039d /libavcodec/h264_ps.c
parentcd645c15d8d91444e49aea589ace4d9f76210641 (diff)
downloadffmpeg-streaming-7fff64e00d886fde11d61958888c82b461cf99b9.zip
ffmpeg-streaming-7fff64e00d886fde11d61958888c82b461cf99b9.tar.gz
h264: check chroma_format_idc range.
Fixes Ticket758 Bug found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
-rw-r--r--libavcodec/h264_ps.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 3184cad..f879576 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;
OpenPOWER on IntegriCloud