History

avcodec/cbs_h266: more restrictive check on pps_tile_idx_delta_val

Fixes: out of array access Fixes: 62603/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5837632490569728

Nuo Mi committed 3 years ago

Commit ce0c1781 parent a1384b41 file · +5 −2Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/cbs_h266_syntax_template.c+5−2
@@ -2043,9 +2043,12 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, · 2042 unmodified lines
20432043 }
20442044 if (i < current->pps_num_slices_in_pic_minus1) {
20452045 if (current->pps_tile_idx_delta_present_flag) {
2046+ // Two conditions must be met:
2047+ // 1. −NumTilesInPic + 1 <= pps_tile_idx_delta_val[i] <= NumTilesInPic − 1
2048+ // 2. 0 <= tile_idx + pps_tile_idx_delta_val[i] <= NumTilesInPic − 1
2049+ // Combining these conditions yields: -tile_idx <= pps_tile_idx_delta_val[i] <= NumTilesInPic - 1 - tile_idx
20462050 ses(pps_tile_idx_delta_val[i],
2047− -current->num_tiles_in_pic + 1,
2048− current->num_tiles_in_pic - 1, 1, i);
2051+ -tile_idx, current->num_tiles_in_pic - 1 - tile_idx, 1, i);
20492052 if (current->pps_tile_idx_delta_val[i] == 0) {
20502053 av_log(ctx->log_ctx, AV_LOG_ERROR,
20512054 "pps_tile_idx_delta_val[i] shall not be equal to 0.\n");

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