From patchwork Sat Aug 17 23:28:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14570 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 0C2764487C2 for ; Sun, 18 Aug 2019 02:36:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E973E68ADF8; Sun, 18 Aug 2019 02:36:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49A1E68ADF7 for ; Sun, 18 Aug 2019 02:36:40 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hz89c-000ARh-4d for ffmpeg-devel@ffmpeg.org; Sun, 18 Aug 2019 01:30:36 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id z88chk071wlysz88dh0pqq; Sun, 18 Aug 2019 01:29:35 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=OyUIQDG7CWg__--N8V8A:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 18 Aug 2019 01:28:40 +0200 Message-Id: <20190817232841.14709-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20190817232841.14709-1-michael@niedermayer.cc> References: <20190817232841.14709-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfMZZGF3YPfEy8e2B2XkhTgeGHOHbDEcsJf8ChFCpQCDiZHtmCp+Wqo/YgiEML7FpNyHBe+vpTmqS2HHfavdfGqdgIoZQHDTtirDaBwF9CJIkdA2d2umB 7tosCxbD7TpJQw/zOfBNUB/AfbOLO3TrPSlUbj2x71UZXaiDr0r/wSd/ Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/apedec: Fix integer overflow in filter_fast_3320() 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: signed integer overflow: -1094994793 * 2 cannot be represented in type 'int' Fixes: 16139/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5663911036059648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 70939abeb4..5d82ff53ff 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -828,7 +828,7 @@ static av_always_inline int filter_fast_3320(APEPredictor *p, return decoded; } - predictionA = p->buf[delayA] * 2 - p->buf[delayA - 1]; + predictionA = p->buf[delayA] * 2U - p->buf[delayA - 1]; p->lastA[filter] = decoded + ((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9); if ((decoded ^ predictionA) > 0)