[FFmpeg-cvslog] avcodec/dvdec: Use av_clip_uint8 instead of ff_crop_tab
Michael Niedermayer
git at videolan.org
Wed Nov 20 01:16:38 EET 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Nov 16 00:10:53 2019 +0100| [d73f06270600c37c74beeceac37f593838ced383] | committer: Michael Niedermayer
avcodec/dvdec: Use av_clip_uint8 instead of ff_crop_tab
Fixes: out of array access
Fixes: 18788/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVVIDEO_fuzzer-6254863113781248
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d73f06270600c37c74beeceac37f593838ced383
---
libavcodec/dvdec.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 578d7f505f..c526091eb4 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -272,11 +272,10 @@ static inline void bit_copy(PutBitContext *pb, GetBitContext *gb)
static av_always_inline void put_block_8x4(int16_t *block, uint8_t *av_restrict p, int stride)
{
int i, j;
- const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
for (i = 0; i < 4; i++) {
for (j = 0; j < 8; j++)
- p[j] = cm[block[j]];
+ p[j] = av_clip_uint8(block[j]);
block += 8;
p += stride;
}
More information about the ffmpeg-cvslog
mailing list