From patchwork Fri Sep 27 17:23:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 15338 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 DEA074490E5 for ; Fri, 27 Sep 2019 20:30:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF02268999B; Fri, 27 Sep 2019 20:30:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39DA06882EA for ; Fri, 27 Sep 2019 20:30:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1iDtzf-0006z0-0w for ffmpeg-devel@ffmpeg.org; Fri, 27 Sep 2019 19:25:23 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Dtyhik0jxwlysDtyhiONsw; Fri, 27 Sep 2019 19:24:23 +0200 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=Zh9sZAud-JrzdKTipX0A:9 a=gXs6kEx-BIqoyab9:21 a=bUP6VNJpfyiv0hC3:21 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 27 Sep 2019 19:23:47 +0200 Message-Id: <20190927172350.2095-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190927172350.2095-1-michael@niedermayer.cc> References: <20190927172350.2095-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfK5KxkoM0F4kN5mlADLRN/gaXFpVMBuL8zeAFL/MJnMERxP8xqSSz7dgTsCT/YRCLqzTZWr59MWYiwcMo4YtR9x+YRAVcOX9QWIJhe3LNHXDQPfEXkuG y/FV6nd6hXJg9kGSQf0IKv9ZTaIFsfOAFQeTCK6MTrzDEmd2e4xSNUzk Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/g723_1dec: Fix overflow in shift 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: shift exponent 1008 is too large for 32-bit type 'int' Fixes: 17700/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5707633436131328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/g723_1dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index d1faf92c39..a7bf528470 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -678,6 +678,8 @@ static int estimate_sid_gain(G723_1_ChannelContext *p) else t = INT32_MAX; } else t = p->sid_gain << shift; + } else if(shift < -31) { + t = (p->sid_gain < 0) ? -1 : 0; }else t = p->sid_gain >> -shift; x = av_clipl_int32(t * (int64_t)cng_filt[0] >> 16);