History

avcodec/cbs_h266_syntax_template: add missing checks to subpic dimension values

Fixes: division by zero Fixes: 60306/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5538913553612800

James Almer committed 3 years ago

Commit 673862e1 parent c92948d1 file · +9 −1Browse files

Unified · Split

libavcodec/cbs_h266_syntax_template.c+9−1
@@ -1140,6 +1140,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 1139 unmodified lines
1140 if (current->sps_num_subpics_minus1 > 0) {1140 if (current->sps_num_subpics_minus1 > 0) {
1141 int wlen = av_ceil_log2(tmp_width_val);1141 int wlen = av_ceil_log2(tmp_width_val);
1142 int hlen = av_ceil_log2(tmp_height_val);1142 int hlen = av_ceil_log2(tmp_height_val);
1143 infer(sps_subpic_ctu_top_left_x[0], 0);
1144 infer(sps_subpic_ctu_top_left_y[0], 0);
1143 if (current->sps_pic_width_max_in_luma_samples > ctb_size_y)1145 if (current->sps_pic_width_max_in_luma_samples > ctb_size_y)
1144 ubs(wlen, sps_subpic_width_minus1[0], 1, 0);1146 ubs(wlen, sps_subpic_width_minus1[0], 1, 0);
1145 else1147 else
@@ -1147,7 +1149,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 1 unmodified line
1147 if (current->sps_pic_height_max_in_luma_samples > ctb_size_y)1149 if (current->sps_pic_height_max_in_luma_samples > ctb_size_y)
1148 ubs(hlen, sps_subpic_height_minus1[0], 1, 0);1150 ubs(hlen, sps_subpic_height_minus1[0], 1, 0);
1149 else1151 else
1150 infer(sps_subpic_height_minus1[0], tmp_height_val);1152 infer(sps_subpic_height_minus1[0], tmp_height_val - 1);
1151 if (!current->sps_independent_subpics_flag) {1153 if (!current->sps_independent_subpics_flag) {
1152 flags(sps_subpic_treated_as_pic_flag[0], 1, 0);1154 flags(sps_subpic_treated_as_pic_flag[0], 1, 0);
1153 flags(sps_loop_filter_across_subpic_enabled_flag[0], 1, 0);1155 flags(sps_loop_filter_across_subpic_enabled_flag[0], 1, 0);
@@ -1187,6 +1189,12 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, · 33 unmodified lines
1187 } else {1189 } else {
1188 int num_subpic_cols = tmp_width_val /1190 int num_subpic_cols = tmp_width_val /
1189 (current->sps_subpic_width_minus1[0] + 1);1191 (current->sps_subpic_width_minus1[0] + 1);
1192 if (tmp_width_val % (current->sps_subpic_width_minus1[0] + 1) ||
1193 tmp_height_val % (current->sps_subpic_width_minus1[0] + 1) ||
1194 current->sps_num_subpics_minus1 !=
1195 (num_subpic_cols * tmp_height_val /
1196 (current->sps_subpic_height_minus1[0] + 1) - 1))
1197 return AVERROR_INVALIDDATA;
1190 infer(sps_subpic_ctu_top_left_x[i],1198 infer(sps_subpic_ctu_top_left_x[i],
1191 (i % num_subpic_cols) *1199 (i % num_subpic_cols) *
1192 (current->sps_subpic_width_minus1[0] + 1));1200 (current->sps_subpic_width_minus1[0] + 1));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t