| Message ID | 20230122000222.18719-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | b95b2c8492fc1b52afd8fbe67b3be3cd518485d6 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/utils: use 32pixel alignment for bink | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Sun, Jan 22, 2023 at 01:02:21AM +0100, Michael Niedermayer wrote: > bink supports 16x16 blocks in chroma planes thus we need to allocate enough. > Fixes: out of array access > Fixes: 55026/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6013915371012096 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/utils.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > index 2b63a498b9..87634e3711 100644 > --- a/libavcodec/utils.c > +++ b/libavcodec/utils.c > @@ -243,6 +243,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, > case AV_PIX_FMT_GBRAP16BE: > w_align = 16; //FIXME assume 16 pixel per macroblock > h_align = 16 * 2; // interlaced needs 2 macroblocks height > + if (s->codec_id == AV_CODEC_ID_BINKVIDEO) > + w_align = 16*2; > break; > case AV_PIX_FMT_YUV411P: > case AV_PIX_FMT_YUVJ411P: please apply. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
On Fri, Jan 27, 2023 at 10:59:38AM +1100, Peter Ross wrote: > On Sun, Jan 22, 2023 at 01:02:21AM +0100, Michael Niedermayer wrote: > > bink supports 16x16 blocks in chroma planes thus we need to allocate enough. > > Fixes: out of array access > > Fixes: 55026/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6013915371012096 > > > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/utils.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > > index 2b63a498b9..87634e3711 100644 > > --- a/libavcodec/utils.c > > +++ b/libavcodec/utils.c > > @@ -243,6 +243,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, > > case AV_PIX_FMT_GBRAP16BE: > > w_align = 16; //FIXME assume 16 pixel per macroblock > > h_align = 16 * 2; // interlaced needs 2 macroblocks height > > + if (s->codec_id == AV_CODEC_ID_BINKVIDEO) > > + w_align = 16*2; > > break; > > case AV_PIX_FMT_YUV411P: > > case AV_PIX_FMT_YUVJ411P: > > please apply. will apply thx [...]
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2b63a498b9..87634e3711 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -243,6 +243,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, case AV_PIX_FMT_GBRAP16BE: w_align = 16; //FIXME assume 16 pixel per macroblock h_align = 16 * 2; // interlaced needs 2 macroblocks height + if (s->codec_id == AV_CODEC_ID_BINKVIDEO) + w_align = 16*2; break; case AV_PIX_FMT_YUV411P: case AV_PIX_FMT_YUVJ411P:
bink supports 16x16 blocks in chroma planes thus we need to allocate enough. Fixes: out of array access Fixes: 55026/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6013915371012096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+)