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

avcodec/hevc_ps: add proper bound checks around cm_ref_layer_id in colour_mapping_table. 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Clement Lecigne 2023-05-17 19:28:54 +02:00 committed by James Almer
parent 8450531059
commit 96c30affba
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/hevc_ps.c
View File

@ -1374,10 +1374,15 @@ static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_dept
}
}
static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps)
static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPPS *pps)
{
pps->num_cm_ref_layers_minus1 = get_ue_golomb_long(gb);
for (int i = 0; i <= pps->num_cm_ref_layers_minus1; i++)
pps->num_cm_ref_layers = get_ue_golomb(gb) + 1;
if (pps->num_cm_ref_layers > 62) {
av_log(avctx, AV_LOG_ERROR,
"num_cm_ref_layers_minus1 shall be in the range [0, 61].\n");
return AVERROR_INVALIDDATA;
}
for (int i = 0; i < pps->num_cm_ref_layers; i++)
pps->cm_ref_layer_id[i] = get_bits(gb, 6);
pps->cm_octant_depth = get_bits(gb, 2);
@ -1397,6 +1402,8 @@ static void colour_mapping_table(GetBitContext *gb, HEVCPPS *pps)
}
colour_mapping_octants(gb, pps, 0, 0, 0, 0, 1 << pps->cm_octant_depth);
return 0;
}
static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx,
@ -1439,8 +1446,11 @@ static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx,
}
pps->colour_mapping_enabled_flag = get_bits1(gb);
if (pps->colour_mapping_enabled_flag)
colour_mapping_table(gb, pps);
if (pps->colour_mapping_enabled_flag) {
int ret = colour_mapping_table(gb, avctx, pps);
if (ret < 0)
return ret;
}
return 0;
}

4
libavcodec/hevc_ps.h
View File

@ -332,8 +332,8 @@ typedef struct HEVCPPS {
int8_t phase_hor_chroma[64];
int8_t phase_ver_chroma[64];
uint8_t colour_mapping_enabled_flag;
uint16_t num_cm_ref_layers_minus1;
uint8_t cm_ref_layer_id[63];
uint8_t num_cm_ref_layers;
uint8_t cm_ref_layer_id[62];
uint8_t cm_octant_depth;
uint8_t cm_y_part_num_log2;
uint8_t luma_bit_depth_cm_input;