har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/evc_ps: Check num_ref_pic_list_in_sps

Browse Source 
Fixes: out of array write
Fixes: 60798/clusterfuzz-testcase-minimized-ffmpeg_BSF_EVC_FRAME_MERGE_fuzzer-4633529766772736

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-07-27 00:14:15 +02:00
parent f983303af4
commit cf9cd35aa9
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/evc.h
View File

@ -126,7 +126,7 @@ enum {
EVC_MAX_NUM_REF_PICS = 21, EVC_MAX_NUM_REF_PICS = 21,
EVC_MAX_NUM_RPLS = 32, EVC_MAX_NUM_RPLS = 64,
// A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are // A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are
// constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/ // constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/

9
libavcodec/evc_ps.c
View File

@ -243,11 +243,20 @@ int ff_evc_parse_sps(GetBitContext *gb, EVCParamSets *ps)
sps->rpl1_same_as_rpl0_flag = get_bits1(gb); sps->rpl1_same_as_rpl0_flag = get_bits1(gb);
sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(gb); sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(gb);
if ((unsigned)sps->num_ref_pic_list_in_sps[0] >= EVC_MAX_NUM_RPLS) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
for (int i = 0; i < sps->num_ref_pic_list_in_sps[0]; ++i) for (int i = 0; i < sps->num_ref_pic_list_in_sps[0]; ++i)
ref_pic_list_struct(gb, &sps->rpls[0][i]); ref_pic_list_struct(gb, &sps->rpls[0][i]);
if (!sps->rpl1_same_as_rpl0_flag) { if (!sps->rpl1_same_as_rpl0_flag) {
sps->num_ref_pic_list_in_sps[1] = get_ue_golomb(gb); sps->num_ref_pic_list_in_sps[1] = get_ue_golomb(gb);
if ((unsigned)sps->num_ref_pic_list_in_sps[1] >= EVC_MAX_NUM_RPLS) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
for (int i = 0; i < sps->num_ref_pic_list_in_sps[1]; ++i) for (int i = 0; i < sps->num_ref_pic_list_in_sps[1]; ++i)
ref_pic_list_struct(gb, &sps->rpls[1][i]); ref_pic_list_struct(gb, &sps->rpls[1][i]);
} }