From d23b28c78b56f53f3f0e74edb0f15a3b451207ad Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 5 Dec 2008 21:44:18 +0000 Subject: Check that cpb_count is within the allowed range. Originally committed as revision 16010 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'libavcodec/h264.c') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8fe20e6029..a85d592807 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6834,10 +6834,16 @@ static int decode_sei(H264Context *h){ return 0; } -static inline void decode_hrd_parameters(H264Context *h, SPS *sps){ +static inline int decode_hrd_parameters(H264Context *h, SPS *sps){ MpegEncContext * const s = &h->s; int cpb_count, i; cpb_count = get_ue_golomb(&s->gb) + 1; + + if(cpb_count > 32U){ + av_log(h->s.avctx, AV_LOG_ERROR, "cpb_count %d invalid\n", cpb_count); + return -1; + } + get_bits(&s->gb, 4); /* bit_rate_scale */ get_bits(&s->gb, 4); /* cpb_size_scale */ for(i=0; icpb_removal_delay_length = get_bits(&s->gb, 5) + 1; sps->dpb_output_delay_length = get_bits(&s->gb, 5) + 1; sps->time_offset_length = get_bits(&s->gb, 5); + return 0; } static inline int decode_vui_parameters(H264Context *h, SPS *sps){ @@ -6903,10 +6910,12 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){ sps->nal_hrd_parameters_present_flag = get_bits1(&s->gb); if(sps->nal_hrd_parameters_present_flag) - decode_hrd_parameters(h, sps); + if(decode_hrd_parameters(h, sps) < 0) + return -1; sps->vcl_hrd_parameters_present_flag = get_bits1(&s->gb); if(sps->vcl_hrd_parameters_present_flag) - decode_hrd_parameters(h, sps); + if(decode_hrd_parameters(h, sps) < 0) + return -1; if(sps->nal_hrd_parameters_present_flag || sps->vcl_hrd_parameters_present_flag) get_bits1(&s->gb); /* low_delay_hrd_flag */ sps->pic_struct_present_flag = get_bits1(&s->gb); -- cgit v1.2.3