From: Michael Niedermayer Date: Sat, 23 Feb 2019 23:44:40 +0000 (+0100) Subject: avcodec/qpeg: Limit copy in qpeg_decode_intra() to the available bytes X-Git-Tag: n4.2~1109 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=b819472995f55e827d6bb70dcdd86d963f65ae31;ds=sidebyside avcodec/qpeg: Limit copy in qpeg_decode_intra() to the available bytes Fixes: Timeout (27 sec -> 39 milli sec) Fixes: 13151/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QPEG_fuzzer-5717536023248896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 654fd998d6..d4195c5f0b 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -99,6 +99,8 @@ static void qpeg_decode_intra(QpegContext *qctx, uint8_t *dst, } } } else { + if (bytestream2_get_bytes_left(&qctx->buffer) < copy) + copy = bytestream2_get_bytes_left(&qctx->buffer); for(i = 0; i < copy; i++) { dst[filled++] = bytestream2_get_byte(&qctx->buffer); if (filled >= width) {