diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-24 00:44:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-24 10:39:03 +0100 |
| commit | 5ff9505770a1438f2a3d82a7c1c84fa4a99a54aa (patch) | |
| tree | b9adfebb7f57165cd2ab05e2690c8406e7cbbf49 | |
| parent | 8c69d65cb4d2314549fd6f6ddce82d1a8ee83724 (diff) | |
| download | ffmpeg-5ff9505770a1438f2a3d82a7c1c84fa4a99a54aa.tar.gz | |
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 <michael@niedermayer.cc>
(cherry picked from commit b819472995f55e827d6bb70dcdd86d963f65ae31)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/qpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 9bfecc3a31..74a6a0ee7f 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -90,6 +90,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) { |