RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h264_ps: Check offset_for_non_ref_pic, offset_for_top_to_bottom_field and offset_for_ref_frame 

Fixes: signed integer overflow: -2147483648 + -1 cannot be represented in type 'int'
Fixes: 14444/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5675880333967360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-05-11 19:36:55 +02:00
parent 407e7c34ca
commit 7c6f2bfdb2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/h264_ps.c
View File

@ -451,6 +451,15 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
sps->delta_pic_order_always_zero_flag = get_bits1(gb);
sps->offset_for_non_ref_pic = get_se_golomb_long(gb);
sps->offset_for_top_to_bottom_field = get_se_golomb_long(gb);
if ( sps->offset_for_non_ref_pic == INT32_MIN
|| sps->offset_for_top_to_bottom_field == INT32_MIN
) {
av_log(avctx, AV_LOG_ERROR,
"offset_for_non_ref_pic or offset_for_top_to_bottom_field is out of range\n");
goto fail;
}
sps->poc_cycle_length = get_ue_golomb(gb);
if ((unsigned)sps->poc_cycle_length >=
@ -460,8 +469,14 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
goto fail;
}
for (i = 0; i < sps->poc_cycle_length; i++)
for (i = 0; i < sps->poc_cycle_length; i++) {
sps->offset_for_ref_frame[i] = get_se_golomb_long(gb);
if (sps->offset_for_ref_frame[i] == INT32_MIN) {
av_log(avctx, AV_LOG_ERROR,
"offset_for_ref_frame is out of range\n");
goto fail;
}
}
} else if (sps->poc_type != 2) {
av_log(avctx, AV_LOG_ERROR, "illegal POC type %d\n", sps->poc_type);
goto fail;