virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/ivi: Move buffer/block end check to caller of ivi_dc_transform()

Browse Source 
Fixes: assertion failure
Fixes: 14078/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO5_fuzzer-5760571284127744

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-04-12 00:09:57 +02:00
parent 837820f385
commit 110dce9633
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/ivi.c
View File

@ -496,12 +496,6 @@ static int ivi_dec_tile_data_size(GetBitContext *gb)
static int ivi_dc_transform(const IVIBandDesc *band, int *prev_dc, int buf_offs, static int ivi_dc_transform(const IVIBandDesc *band, int *prev_dc, int buf_offs,
int blk_size) int blk_size)
{ {
int buf_size = band->pitch * band->aheight - buf_offs;
int min_size = (blk_size - 1) * band->pitch + blk_size;
if (min_size > buf_size)
return AVERROR_INVALIDDATA;
band->dc_transform(prev_dc, band->buf + buf_offs, band->dc_transform(prev_dc, band->buf + buf_offs,
band->pitch, blk_size); band->pitch, blk_size);
@ -732,6 +726,11 @@ static int ivi_decode_blocks(GetBitContext *gb, const IVIBandDesc *band,
if (ret < 0) if (ret < 0)
return ret; return ret;
} else { } else {
int buf_size = band->pitch * band->aheight - buf_offs;
int min_size = (blk_size - 1) * band->pitch + blk_size;
if (min_size > buf_size)
return AVERROR_INVALIDDATA;
/* block not coded */ /* block not coded */
/* for intra blocks apply the dc slant transform */ /* for intra blocks apply the dc slant transform */
/* for inter - perform the motion compensation without delta */ /* for inter - perform the motion compensation without delta */