generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/hevc: Check cpb_cnt_minus1

Browse Source 
Fixes CID1239014

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2cddc0b19a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-12 19:09:06 +02:00
parent b7a3a3a8d2
commit 05c2801413
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/hevc.c
View File

@@ -189,7 +189,7 @@ static void skip_sub_layer_hrd_parameters(GetBitContext *gb,
} }
} }
static void skip_hrd_parameters(GetBitContext *gb, uint8_t cprms_present_flag, static int skip_hrd_parameters(GetBitContext *gb, uint8_t cprms_present_flag,
unsigned int max_sub_layers_minus1) unsigned int max_sub_layers_minus1)
{ {
unsigned int i; unsigned int i;
@@ -246,8 +246,11 @@ static void skip_hrd_parameters(GetBitContext *gb, uint8_t cprms_present_flag,
else else
low_delay_hrd_flag = get_bits1(gb); low_delay_hrd_flag = get_bits1(gb);
if (!low_delay_hrd_flag) if (!low_delay_hrd_flag) {
cpb_cnt_minus1 = get_ue_golomb_long(gb); cpb_cnt_minus1 = get_ue_golomb_long(gb);
if (cpb_cnt_minus1 > 31)
return AVERROR_INVALIDDATA;
}
if (nal_hrd_parameters_present_flag) if (nal_hrd_parameters_present_flag)
skip_sub_layer_hrd_parameters(gb, cpb_cnt_minus1, skip_sub_layer_hrd_parameters(gb, cpb_cnt_minus1,
@@ -257,6 +260,8 @@ static void skip_hrd_parameters(GetBitContext *gb, uint8_t cprms_present_flag,
skip_sub_layer_hrd_parameters(gb, cpb_cnt_minus1, skip_sub_layer_hrd_parameters(gb, cpb_cnt_minus1,
sub_pic_hrd_params_present_flag); sub_pic_hrd_params_present_flag);
} }
return 0;
} }
static void skip_timing_info(GetBitContext *gb) static void skip_timing_info(GetBitContext *gb)