From patchwork Thu Jun 15 00:17:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3981 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp542182vsw; Wed, 14 Jun 2017 17:17:50 -0700 (PDT) X-Received: by 10.28.169.87 with SMTP id s84mr1670073wme.62.1497485870787; Wed, 14 Jun 2017 17:17:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497485870; cv=none; d=google.com; s=arc-20160816; b=Z0PDpLRCz7c8ZSnN15iTLyn3oMpkWZyjUTnJleipbU2qj0eU01BCdcKMFESjjWBkPV kOSSRM0oR5l5cSez+lg7hDQR9g2VWjlHMxva6Bnyg4POQiytVqBqR5J3zr71Kj/TkWrJ kJXz98NEo66Uo/nNyKPwWYBOgtScMMP0tpwgb0qGilbDxnJNoYqd/EGWB86WN20T0lPD nC5geAHqhUHKMmtJakOQ2nMfg5OWD1rrtRNJ+18Qigwcn40zu9koJSqrppwFfyas3827 Cs2YYu0zN5daWDJsUZKI991AsAV9WpOax2Id67BAjOdr0vk1OE9ugj/rEWgjg83MS/Qh vzyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=pX4rasApDepfoIRjleLEZ/BObZfPMY16Wqe9mlb1lo4=; b=dwN98DcvJ4xKu2hsR6ydB7+mb7vLG6tDEHSKUF/GWxsFV1VGy9Bn3xtzajGfQvgAt9 VQIS/hleacq4/SrDG81Ae+InVoP4iX2DLKvb5sTfonPI4neoPfyvNEu45lWBYPrcRwag UDJ+CuNy7IWh+tbJ/4O5mSrQHw0vB1LGp3L6WmAHdJtMbyZRB/FaQ0k2Jn9xbk7irIKI NEpRxODc7XV+A4EJh/ULfYFreUcKnGmjkvp+V7cJElfjNAyFBI+Lt2UYZWvyXnWIBwx7 sXJsGG2YAOm0ZDwpeg+nkDZ3xdyj6mPXVfNfErfkl0iY3nExKzp8ABg+hZFGbq1AeV4v 5Dcg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y11si1462405wrd.301.2017.06.14.17.17.50; Wed, 14 Jun 2017 17:17:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F80968A261; Thu, 15 Jun 2017 03:17:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEC6968A21C for ; Thu, 15 Jun 2017 03:17:37 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dLITj-00073r-Uq for ffmpeg-devel@ffmpeg.org; Thu, 15 Jun 2017 02:17:39 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id YoHc1v01J0S5wYM01oHdX6; Thu, 15 Jun 2017 02:17:37 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 15 Jun 2017 02:17:36 +0200 Message-Id: <20170615001736.7258-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/lpc: signed integer overflow in compute_lpc_coefs() (aacdec_fixed) 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: runtime error: signed integer overflow: -1575818955 + -915383657 cannot be represented in type 'int' Fixes: 2224/clusterfuzz-testcase-minimized-6208559949807616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/lpc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h index 182adfa8ca..88ca247f87 100644 --- a/libavcodec/lpc.h +++ b/libavcodec/lpc.h @@ -117,11 +117,14 @@ void ff_lpc_end(LPCContext *s); #if USE_FIXED typedef int LPC_TYPE; +typedef unsigned LPC_TYPE_U; #else #ifdef LPC_USE_DOUBLE typedef double LPC_TYPE; +typedef double LPC_TYPE_U; #else typedef float LPC_TYPE; +typedef float LPC_TYPE_U; #endif #endif // USE_FIXED @@ -192,8 +195,8 @@ static inline int AAC_RENAME(compute_lpc_coefs)(const LPC_TYPE *autoc, int max_o for(j=0; j < (i+1)>>1; j++) { LPC_TYPE f = lpc_last[ j]; LPC_TYPE b = lpc_last[i-1-j]; - lpc[ j] = f + AAC_MUL26(r, b); - lpc[i-1-j] = b + AAC_MUL26(r, f); + lpc[ j] = f + (LPC_TYPE_U)AAC_MUL26(r, b); + lpc[i-1-j] = b + (LPC_TYPE_U)AAC_MUL26(r, f); } if (fail && err < 0)