RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 12:56:56 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/nuv: Move comptype check up

Browse Source 
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>
(cherry picked from commit 1138cdecbe)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-11-02 14:14:44 +01:00
parent 0ae9a8cdbb
commit 4cd8ae5b9c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/nuv.c
View File

@ -217,6 +217,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
case NUV_RTJPEG: case NUV_RTJPEG:
minsize = c->width/16 * (c->height/16) * 6; minsize = c->width/16 * (c->height/16) * 6;
break; 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) if (buf_size < minsize / 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -305,9 +313,6 @@ retry:
case NUV_COPY_LAST: case NUV_COPY_LAST:
/* nothing more to do here */ /* nothing more to do here */
break; break;
default:
av_log(avctx, AV_LOG_ERROR, "unknown compression\n");
return AVERROR_INVALIDDATA;
} }
if ((result = av_frame_ref(picture, c->pic)) < 0) if ((result = av_frame_ref(picture, c->pic)) < 0)