[FFmpeg-devel] [PATCH] avcodec/h263dec: Check input size before GEOV/GEOX special case handling

[FFmpeg-devel] [PATCH] avcodec/h263dec: Check input size before GEOV/GEOX special case handling

[Michael Niedermayer]

Fixes: Timeout
Fixes: 44921/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-6546588791603200

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

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index e940b7f7c7..56a41f6d05 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -702,6 +702,7 @@ frame_end:
 
     if (s->last_picture_ptr || s->low_delay) {
         if (   pict->format == AV_PIX_FMT_YUV420P
+            && buf_size*16LL > s->mb_num
             && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) {
             int x, y, p;
             av_frame_make_writable(pict);
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/h263dec: Check input size before GEOV/GEOX special case handling

[Andreas Rheinhardt]

Michael Niedermayer:
> Fixes: Timeout
> Fixes: 44921/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-6546588791603200
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/h263dec.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
> index e940b7f7c7..56a41f6d05 100644
> --- a/libavcodec/h263dec.c
> +++ b/libavcodec/h263dec.c
> @@ -702,6 +702,7 @@ frame_end:
>  
>      if (s->last_picture_ptr || s->low_delay) {
>          if (   pict->format == AV_PIX_FMT_YUV420P
> +            && buf_size*16LL > s->mb_num
>              && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) {
>              int x, y, p;
>              av_frame_make_writable(pict);

Does https://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/293358.html
not fix the timeout?

- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/h263dec: Check input size before GEOV/GEOX special case handling

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1343 bytes --]

On Fri, Feb 25, 2022 at 09:22:14PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: Timeout
> > Fixes: 44921/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-6546588791603200
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/h263dec.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
> > index e940b7f7c7..56a41f6d05 100644
> > --- a/libavcodec/h263dec.c
> > +++ b/libavcodec/h263dec.c
> > @@ -702,6 +702,7 @@ frame_end:
> >  
> >      if (s->last_picture_ptr || s->low_delay) {
> >          if (   pict->format == AV_PIX_FMT_YUV420P
> > +            && buf_size*16LL > s->mb_num
> >              && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) {
> >              int x, y, p;
> >              av_frame_make_writable(pict);
> 
> Does https://ffmpeg.org/pipermail/ffmpeg-devel/2022-February/293358.html
> not fix the timeout?

that should work too and is better, consider my patch withdrawn

thx
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are best at talking, realize last or never when they are wrong.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".