ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Feb 22 13:36:52 2017 +0100| [9568b2e425f127031ddc91dd78cb9b9f2cae206d] | committer: Michael Niedermayer
avcodec/h264_ps: Check chroma_qp_index_offset Fixes: 647/clusterfuzz-testcase-5195745823031296 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Reviewed-by: BBB Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9568b2e425f127031ddc91dd78cb9b9f2cae206d --- libavcodec/h264_ps.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 8090178..f384ef2 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -828,6 +828,11 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct pps->init_qp = get_se_golomb(gb) + 26 + qp_bd_offset; pps->init_qs = get_se_golomb(gb) + 26 + qp_bd_offset; pps->chroma_qp_index_offset[0] = get_se_golomb(gb); + if (pps->chroma_qp_index_offset[0] < -12 || pps->chroma_qp_index_offset[0] > 12) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + pps->deblocking_filter_parameters_present = get_bits1(gb); pps->constrained_intra_pred = get_bits1(gb); pps->redundant_pic_cnt_present = get_bits1(gb); @@ -845,6 +850,10 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct pps->scaling_matrix4, pps->scaling_matrix8); // second_chroma_qp_index_offset pps->chroma_qp_index_offset[1] = get_se_golomb(gb); + if (pps->chroma_qp_index_offset[1] < -12 || pps->chroma_qp_index_offset[1] > 12) { + ret = AVERROR_INVALIDDATA; + goto fail; + } } else { pps->chroma_qp_index_offset[1] = pps->chroma_qp_index_offset[0]; } _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
