diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-02 19:57:08 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-02 19:41:48 +0100 |
commit | 42734c45785e0b3e816bb1a75cbb7ee9e78fefe3 (patch) | |
tree | dc2ce4e0472c53f61ff72f583fe2d47bc7e52695 | |
parent | 332a03042dc6fc9a06c4a9c41e2a4bb2e95aa160 (diff) | |
download | ffmpeg-42734c45785e0b3e816bb1a75cbb7ee9e78fefe3.tar.gz |
avcodec/ivi: Ask for samples with odd tiles
Fixes: Assertion failure
Fixes: 15422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO5_fuzzer-5676625481433088
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 a7e02cf3ad6f6eaae07fa68ecb93014e1dfd224e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/ivi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index d0e94c09d9..2a9da6411f 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -428,6 +428,10 @@ av_cold int ff_ivi_init_tiles(IVIPlaneDesc *planes, t_height = !p ? tile_height : (tile_height + 3) >> 2; if (!p && planes[0].num_bands == 4) { + if (t_width % 2 || t_height % 2) { + avpriv_request_sample(NULL, "Odd tiles"); + return AVERROR_PATCHWELCOME; + } t_width >>= 1; t_height >>= 1; } |