diff options
| author | Michael Niedermayer <[email protected]> | 2020-04-05 00:11:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2020-05-19 17:17:36 +0200 |
| commit | 726904b6d0a3353e726c06c8480351c83121bf9d (patch) | |
| tree | 8c2e0dc7cd9f6e9e559dd32cb9954760206c6b7b /libavcodec/cbs_h265_syntax_template.c | |
| parent | 751e7f7882714809758143494097949142a93697 (diff) | |
avcodec/cbs_h265_syntax_template: Check num_negative/positive_pics when inter_ref_pic_set_prediction_flag is set
Fixes: out of array access
Fixes: 20446/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-5707770718584832
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 588114cea4ee434c9c61353ed91ffc817d2965f5)
Signed-off-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/cbs_h265_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_h265_syntax_template.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 836bb6db58..8043e3e7b7 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -601,6 +601,8 @@ static int FUNC(st_ref_pic_set)(CodedBitstreamContext *ctx, RWContext *rw, } } + if (i > 15) + return AVERROR_INVALIDDATA; infer(num_negative_pics, i); for (i = 0; i < current->num_negative_pics; i++) { infer(delta_poc_s0_minus1[i], @@ -630,6 +632,8 @@ static int FUNC(st_ref_pic_set)(CodedBitstreamContext *ctx, RWContext *rw, } } + if (i + current->num_negative_pics > 15) + return AVERROR_INVALIDDATA; infer(num_positive_pics, i); for (i = 0; i < current->num_positive_pics; i++) { infer(delta_poc_s1_minus1[i], |