diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 19:25:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 20:49:31 +0200 |
| commit | 0c9283a03f177f682d64ce0ecd7bf817f1a40dca (patch) | |
| tree | 446d58dcfe82937ae4a201a6562ee5c8c94dfae6 /libavcodec | |
| parent | aa1cceb5eb7866d42d05ce22d97b06c620af18cb (diff) | |
| download | ffmpeg-0c9283a03f177f682d64ce0ecd7bf817f1a40dca.tar.gz | |
h264: check log2_max_poc_lsb for validity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_ps.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 261e2d2719..98d779ea3b 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -380,7 +380,12 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ sps->poc_type= get_ue_golomb_31(&s->gb); if(sps->poc_type == 0){ //FIXME #define - sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4; + unsigned t = get_ue_golomb(&s->gb); + if(t>12){ + av_log(h->s.avctx, AV_LOG_ERROR, "log2_max_poc_lsb (%d) is out of range\n", t); + goto fail; + } + sps->log2_max_poc_lsb= t + 4; } else if(sps->poc_type == 1){//FIXME #define sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb); sps->offset_for_non_ref_pic= get_se_golomb(&s->gb); |