From patchwork Fri Nov 15 23:10:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 16290 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 39AD044A324 for ; Sat, 16 Nov 2019 01:13:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1566D68A590; Sat, 16 Nov 2019 01:13:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E987568A471 for ; Sat, 16 Nov 2019 01:13:26 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iVkmL-0006xl-0C for ffmpeg-devel@ffmpeg.org; Sat, 16 Nov 2019 00:13:25 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id VklNiMtudwlysVklNiKpTf; Sat, 16 Nov 2019 00:12:25 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=FNIY_TqsPnS_xfyfHZ4A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Nov 2019 00:10:53 +0100 Message-Id: <20191115231053.2569-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191115231053.2569-1-michael@niedermayer.cc> References: <20191115231053.2569-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfOF9xscNe3rAknp+VQpAOMGn5XA1pkKMnz+NOqNAKVFavtRZjBuu8yVTfYMoGR1umfPckzBHOQjIgzPBG1xbOQDAcGtZC1doMBmPQn3Fl/FX8wX73Ttj 4YiwXgMIqfGK1KV4AAfWMoUFsO7Z3nvA5jKrCid3G0hcI6umBnY4ROIn Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/dvdec: Use av_clip_uint8 instead of ff_crop_tab X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 Signed-off-by: Michael Niedermayer --- 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; }