[FFmpeg-cvslog] avcodec/m101: Move checks before ff_get_buffer()
Michael Niedermayer
git at videolan.org
Sun Aug 28 23:24:14 EEST 2022
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Aug 21 23:55:39 2022 +0200| [4d5c0cca94e384a3b50fad40624d7dbdcf2a50ec] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d5c0cca94e384a3b50fad40624d7dbdcf2a50ec
---
libavcodec/m101.c | 9 ++++-----
1 file 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;
More information about the ffmpeg-cvslog
mailing list