| Message ID | 20210919203536.23964-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 85413a5ae6948a1d6e4e947a4fca984b8c686016 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] oavformat/avidec_ Check offset in odml | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On 9/19/2021 5:35 PM, Michael Niedermayer wrote: > Fixes: index 128 out of bounds for type 'uint16_t [128]' > Fixes: 38651/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-6296416058736640 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/cbs_h265_syntax_template.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c > index 67bc77f9751..fb8ac4a4a77 100644 > --- a/libavcodec/cbs_h265_syntax_template.c > +++ b/libavcodec/cbs_h265_syntax_template.c > @@ -728,7 +728,7 @@ static int FUNC(sps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw, > > flag(sps_palette_predictor_initializer_present_flag); > if (current->sps_palette_predictor_initializer_present_flag) { > - ue(sps_num_palette_predictor_initializer_minus1, 0, 128); > + ue(sps_num_palette_predictor_initializer_minus1, 0, 127); > for (comp = 0; comp < (current->chroma_format_idc ? 3 : 1); comp++) { > int bit_depth = comp == 0 ? current->bit_depth_luma_minus8 + 8 > : current->bit_depth_chroma_minus8 + 8; > sps_num_palette_predictor_initializer_minus1 plus 1 must be at most 128, so LGTM.
On Mon, Sep 20, 2021 at 09:57:02AM -0300, James Almer wrote: > On 9/19/2021 5:35 PM, Michael Niedermayer wrote: > > Fixes: index 128 out of bounds for type 'uint16_t [128]' > > Fixes: 38651/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-6296416058736640 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/cbs_h265_syntax_template.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c > > index 67bc77f9751..fb8ac4a4a77 100644 > > --- a/libavcodec/cbs_h265_syntax_template.c > > +++ b/libavcodec/cbs_h265_syntax_template.c > > @@ -728,7 +728,7 @@ static int FUNC(sps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw, > > flag(sps_palette_predictor_initializer_present_flag); > > if (current->sps_palette_predictor_initializer_present_flag) { > > - ue(sps_num_palette_predictor_initializer_minus1, 0, 128); > > + ue(sps_num_palette_predictor_initializer_minus1, 0, 127); > > for (comp = 0; comp < (current->chroma_format_idc ? 3 : 1); comp++) { > > int bit_depth = comp == 0 ? current->bit_depth_luma_minus8 + 8 > > : current->bit_depth_chroma_minus8 + 8; > > > > sps_num_palette_predictor_initializer_minus1 plus 1 must be at most 128, so > LGTM. will apply thx [...]
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 67bc77f9751..fb8ac4a4a77 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -728,7 +728,7 @@ static int FUNC(sps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw, flag(sps_palette_predictor_initializer_present_flag); if (current->sps_palette_predictor_initializer_present_flag) { - ue(sps_num_palette_predictor_initializer_minus1, 0, 128); + ue(sps_num_palette_predictor_initializer_minus1, 0, 127); for (comp = 0; comp < (current->chroma_format_idc ? 3 : 1); comp++) { int bit_depth = comp == 0 ? current->bit_depth_luma_minus8 + 8 : current->bit_depth_chroma_minus8 + 8;
Fixes: index 128 out of bounds for type 'uint16_t [128]' Fixes: 38651/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-6296416058736640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/cbs_h265_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)