diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-01-11 19:39:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-04-07 23:40:44 +0200 |
| commit | bc9e149c2a0b79290d815bf62343b94b8b430e61 (patch) | |
| tree | 4b85a089325c881cc2057b3a8bb3b82b4c8e412f | |
| parent | 0c5f3c230af4a2e70aa5c6daae72f2742fb7f29e (diff) | |
| download | ffmpeg-bc9e149c2a0b79290d815bf62343b94b8b430e61.tar.gz | |
avcodec/utils: Ensure linesize for SVQ3
Fixes: Assertion block_w * sizeof(uint8_t) <= ((buf_linesize) >= 0 ? (buf_linesize) : (-(buf_linesize))
Fixes: 54861/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SVQ3_fuzzer-5352418248622080
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 4eef658ca59d3d6ba46ab52a36d7faf5fe820874)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 60bfddc657..fdc3de1b1d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -330,6 +330,9 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, // the next rounded up width is 32 *width = FFMAX(*width, 32); } + if (s->codec_id == AV_CODEC_ID_SVQ3) { + *width = FFMAX(*width, 32); + } for (i = 0; i < 4; i++) linesize_align[i] = STRIDE_ALIGN; |