Commit 588114ce authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/cbs_h265_syntax_template: Check num_negative/positive_pics when...

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/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 0a9ccc25
...@@ -601,6 +601,8 @@ static int FUNC(st_ref_pic_set)(CodedBitstreamContext *ctx, RWContext *rw, ...@@ -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); infer(num_negative_pics, i);
for (i = 0; i < current->num_negative_pics; i++) { for (i = 0; i < current->num_negative_pics; i++) {
infer(delta_poc_s0_minus1[i], infer(delta_poc_s0_minus1[i],
...@@ -630,6 +632,8 @@ static int FUNC(st_ref_pic_set)(CodedBitstreamContext *ctx, RWContext *rw, ...@@ -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); infer(num_positive_pics, i);
for (i = 0; i < current->num_positive_pics; i++) { for (i = 0; i < current->num_positive_pics; i++) {
infer(delta_poc_s1_minus1[i], infer(delta_poc_s1_minus1[i],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment