[FFmpeg-devel,2/5] avcodec/nuv: Move comptype check up

Submitted by Michael Niedermayer on Nov. 2, 2019, 4:05 p.m.

Details

Message ID 20191102160601.14711-2-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Nov. 2, 2019, 4:05 p.m.
Fixes: Timeout (23sec -> 5ms)
Fixes: 18517/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-5753135536013312

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

Comments

Carl Eugen Hoyos Nov. 6, 2019, 12:31 a.m.
Am Sa., 2. Nov. 2019 um 17:08 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> Fixes: Timeout (23sec -> 5ms)
> Fixes: 18517/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-5753135536013312
>
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/nuv.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
> index bb80e3e884..0fa61a239d 100644
> --- a/libavcodec/nuv.c
> +++ b/libavcodec/nuv.c
> @@ -219,6 +219,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
>      case NUV_RTJPEG:
>          minsize = c->width/16 * (c->height/16) * 6;
>          break;

> +    case NUV_BLACK: case NUV_COPY_LAST: case NUV_LZO: case NUV_RTJPEG_IN_LZO:

This style is ugly and different from the rest of the file.

> +        break;
> +    default:
> +        av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
> +        return AVERROR_INVALIDDATA;
>      }
>      if (buf_size < minsize / 4)
>          return AVERROR_INVALIDDATA;
> @@ -307,9 +312,6 @@ retry:
>      case NUV_COPY_LAST:
>          /* nothing more to do here */
>          break;
> -    default:
> -        av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
> -        return AVERROR_INVALIDDATA;

Carl Eugen

Patch hide | download patch | download mbox

diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index bb80e3e884..0fa61a239d 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -219,6 +219,11 @@  static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     case NUV_RTJPEG:
         minsize = c->width/16 * (c->height/16) * 6;
         break;
+    case NUV_BLACK: case NUV_COPY_LAST: case NUV_LZO: case NUV_RTJPEG_IN_LZO:
+        break;
+    default:
+        av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
+        return AVERROR_INVALIDDATA;
     }
     if (buf_size < minsize / 4)
         return AVERROR_INVALIDDATA;
@@ -307,9 +312,6 @@  retry:
     case NUV_COPY_LAST:
         /* nothing more to do here */
         break;
-    default:
-        av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
-        return AVERROR_INVALIDDATA;
     }
 
     if ((result = av_frame_ref(picture, c->pic)) < 0)