diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-21 23:55:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-08-28 22:06:43 +0200 |
| commit | 4d5c0cca94e384a3b50fad40624d7dbdcf2a50ec (patch) | |
| tree | 26e80193b384dba46bbdf02fd282bbcd9c79202e /libavcodec/m101.c | |
| parent | 049ed1dadaa39b150b9718349e98087170a5106d (diff) | |
| download | ffmpeg-4d5c0cca94e384a3b50fad40624d7dbdcf2a50ec.tar.gz | |
avcodec/m101: Move checks before ff_get_buffer()
Fixes: Timeout
Fixes: 50109/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_M101_fuzzer-6553193986785280
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/m101.c')
| -rw-r--r-- | libavcodec/m101.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/m101.c b/libavcodec/m101.c index 7c719006ec..5a06f02c37 100644 --- a/libavcodec/m101.c +++ b/libavcodec/m101.c @@ -53,11 +53,6 @@ static int m101_decode_frame(AVCodecContext *avctx, AVFrame *frame, int min_stride = 2 * avctx->width; int bits = avctx->extradata[2*4]; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) - return ret; - frame->pict_type = AV_PICTURE_TYPE_I; - frame->key_frame = 1; - stride = AV_RL32(avctx->extradata + 5*4); if (avctx->pix_fmt == AV_PIX_FMT_YUV422P10) @@ -69,6 +64,10 @@ static int m101_decode_frame(AVCodecContext *avctx, AVFrame *frame, return AVERROR_INVALIDDATA; } + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + frame->pict_type = AV_PICTURE_TYPE_I; + frame->key_frame = 1; frame->interlaced_frame = ((avctx->extradata[3*4] & 3) != 3); if (frame->interlaced_frame) frame->top_field_first = avctx->extradata[3*4] & 1; |