har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mvha: Check input size for HUFY before picture allocation

Browse Source 
Fixes: Timeout
Fixes: 54772/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MVHA_fuzzer-5484199677394944

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-01-06 23:53:17 +01:00
parent 2f48d227c1
commit 50c0f2ddd3
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mvha.c
View File

@ -159,9 +159,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
if (size < 1 || size >= avpkt->size) if (size < 1 || size >= avpkt->size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
if (type == MKTAG('L','Z','Y','V')) { if (type == MKTAG('L','Z','Y','V')) {
z_stream *const zstream = &s->zstream.zstream; z_stream *const zstream = &s->zstream.zstream;
ret = inflateReset(zstream); ret = inflateReset(zstream);
@ -170,6 +167,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
zstream->next_in = avpkt->data + 8; zstream->next_in = avpkt->data + 8;
zstream->avail_in = avpkt->size - 8; zstream->avail_in = avpkt->size - 8;
@ -218,10 +218,16 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
} }
} }
if (get_bits_left(gb) < avctx->height * avctx->width)
return AVERROR_INVALIDDATA;
ret = build_vlc(avctx, &s->vlc); ret = build_vlc(avctx, &s->vlc);
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
for (int p = 0; p < 3; p++) { for (int p = 0; p < 3; p++) {
int width = avctx->width >> (p > 0); int width = avctx->width >> (p > 0);
ptrdiff_t stride = frame->linesize[p]; ptrdiff_t stride = frame->linesize[p];