LAV
/
FFmpeg
1
0
Fork 0
Code

avcodec/cbs_h266_syntax_template: check aps_adaptation_parameter_set_id 

"When aps_params_type is equal to ALF_APS or SCALING_APS, the value of aps_adaptation_parameter_set_id shall be
in the range of 0 to 7, inclusive.
When aps_params_type is equal to LMCS_APS, the value of aps_adaptation_parameter_set_id shall be in the range of 0
to 3, inclusive."

Fixes: out of array accesses
Fixes: 65932/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-4563412340244480

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:
James Almer 2024-01-27 04:13:32 +01:00 committed by Nuo Mi
parent 01388936a8
commit cc774cd962
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/cbs_h266_syntax_template.c
View File

@ -2456,6 +2456,7 @@ static int FUNC(scaling_list_data)(CodedBitstreamContext *ctx, RWContext *rw,
static int FUNC(aps)(CodedBitstreamContext *ctx, RWContext *rw,
H266RawAPS *current, int prefix)
{
int aps_id_max = MAX_UINT_BITS(5);
int err;
if (prefix)
@ -2468,7 +2469,12 @@ static int FUNC(aps)(CodedBitstreamContext *ctx, RWContext *rw,
: VVC_SUFFIX_APS_NUT));
ub(3, aps_params_type);
ub(5, aps_adaptation_parameter_set_id);
if (current->aps_params_type == VVC_ASP_TYPE_ALF ||
current->aps_params_type == VVC_ASP_TYPE_SCALING)
aps_id_max = 7;
else if (current->aps_params_type == VVC_ASP_TYPE_LMCS)
aps_id_max = 3;
u(5, aps_adaptation_parameter_set_id, 0, aps_id_max);
flag(aps_chroma_present_flag);
if (current->aps_params_type == VVC_ASP_TYPE_ALF)
CHECK(FUNC(alf_data)(ctx, rw, current));