diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-01-07 02:44:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-01-07 23:21:47 +0100 |
| commit | 038d291b70bffa550cde552f8325e1b9f71f0646 (patch) | |
| tree | 3230061a216fc7eb718435cffcf6ea5ab504895f | |
| parent | e9564f7feaf25b5c0ccd73e835b69a0dbba06786 (diff) | |
| download | ffmpeg-038d291b70bffa550cde552f8325e1b9f71f0646.tar.gz | |
avcodec/qpeg: Optimize long runs in qpeg_decode_intra() not spanning a full row
Fixes: Timeout
Fixes: 11354/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QPEG_fuzzer-5766275943366656
Before: Executed clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QPEG_fuzzer-5766275943366656 in 9470 ms
After : Executed clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QPEG_fuzzer-5766275943366656 in 134 ms
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/qpeg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index cb452621e7..654fd998d6 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -80,7 +80,10 @@ static void qpeg_decode_intra(QpegContext *qctx, uint8_t *dst, p = bytestream2_get_byte(&qctx->buffer); for(i = 0; i < run; i++) { - dst[filled++] = p; + int step = FFMIN(run - i, width - filled); + memset(dst+filled, p, step); + filled += step; + i += step - 1; if (filled >= width) { filled = 0; dst -= stride; |