diff mbox series

[FFmpeg-devel,1/3] avcodec/bitpacked: ,

Message ID 20200603231919.26199-1-michael@niedermayer.cc
State Accepted
Commit e34686d7acdd2d2562286753a727e100cedd6393
Headers show
Series [FFmpeg-devel,1/3] avcodec/bitpacked: , | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer June 3, 2020, 11:19 p.m. UTC
Fixes: array end overread
Fixes: 22395/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BITPACKED_fuzzer-5760940300828672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/bitpacked.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Darnley June 4, 2020, 1:11 a.m. UTC | #1
On 2020-06-04 01:19, Michael Niedermayer wrote:
> Fixes: array end overread
> Fixes: 22395/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BITPACKED_fuzzer-5760940300828672
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/bitpacked.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/bitpacked.c b/libavcodec/bitpacked.c
> index be7d1e3629..952ba73a32 100644
> --- a/libavcodec/bitpacked.c
> +++ b/libavcodec/bitpacked.c
> @@ -147,7 +147,7 @@ AVCodec ff_bitpacked_decoder = {
>      .decode = bitpacked_decode,
>      .capabilities = AV_CODEC_CAP_EXPERIMENTAL,
>      .codec_tags     = (const uint32_t []){
> -        MKTAG('U', 'Y', 'V', 'Y')
> +        MKTAG('U', 'Y', 'V', 'Y'),
>          FF_CODEC_TAGS_END,
>      },
>  };
> 

I think you should add to the commit title.  Something like "add missing
comma to codec tags".

Other than that this looks fine.
Michael Niedermayer June 4, 2020, 5:21 p.m. UTC | #2
On Thu, Jun 04, 2020 at 03:11:12AM +0200, James Darnley wrote:
> On 2020-06-04 01:19, Michael Niedermayer wrote:
> > Fixes: array end overread
> > Fixes: 22395/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BITPACKED_fuzzer-5760940300828672
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/bitpacked.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/bitpacked.c b/libavcodec/bitpacked.c
> > index be7d1e3629..952ba73a32 100644
> > --- a/libavcodec/bitpacked.c
> > +++ b/libavcodec/bitpacked.c
> > @@ -147,7 +147,7 @@ AVCodec ff_bitpacked_decoder = {
> >      .decode = bitpacked_decode,
> >      .capabilities = AV_CODEC_CAP_EXPERIMENTAL,
> >      .codec_tags     = (const uint32_t []){
> > -        MKTAG('U', 'Y', 'V', 'Y')
> > +        MKTAG('U', 'Y', 'V', 'Y'),
> >          FF_CODEC_TAGS_END,
> >      },
> >  };
> > 
> 
> I think you should add to the commit title.  Something like "add missing
> comma to codec tags".

sure, will apply with that

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/bitpacked.c b/libavcodec/bitpacked.c
index be7d1e3629..952ba73a32 100644
--- a/libavcodec/bitpacked.c
+++ b/libavcodec/bitpacked.c
@@ -147,7 +147,7 @@  AVCodec ff_bitpacked_decoder = {
     .decode = bitpacked_decode,
     .capabilities = AV_CODEC_CAP_EXPERIMENTAL,
     .codec_tags     = (const uint32_t []){
-        MKTAG('U', 'Y', 'V', 'Y')
+        MKTAG('U', 'Y', 'V', 'Y'),
         FF_CODEC_TAGS_END,
     },
 };