From patchwork Sat May 20 15:52:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3702 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp751441vsk; Sat, 20 May 2017 08:52:42 -0700 (PDT) X-Received: by 10.28.66.212 with SMTP id k81mr19508449wmi.132.1495295562071; Sat, 20 May 2017 08:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495295562; cv=none; d=google.com; s=arc-20160816; b=u0AgG+p7SZ7aMYHY5E0B6GKoNq9bsE/e1oSt6Vlnkrn6t5p8+cq2c9YHNIufFlnDq0 jw1/8IJkJphqImhrxeiegJJZcu0vG2gblsyNlDJDb8wdPujYvFbZEjA8JXREpbPjQOtb /pM0p9Rw0/EMM8Pt0YSY/xZKh475OOGblqtHklSsXr2wd0rNAoCwEeb2+ctgAnBWCtdI GP/jITCEZz0eEH/BumyjZjjNsWUUCagyftKmliGPiIlpGs6kwIvQK9jNImKUvN7rQTxr xYMcJX4efjQOa1Bt1d9BcLGRok+NyUSS93j53Y2OHBobtjzC1NYwZe5qMdqKxAzlwEZO vQJA== 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=BmocvlRSmTXtN1iMFaWMojR+QDmwshWoEdAZwiL3jeQ=; b=FtzZkZHRZeoXcQc5rlEpGC+noA3a3BYY8qDgNBO9v/Avx1E5JLKdjopk0qCAchojlK 228AG++4FF1qSxi84JSaKeOivS7AXr6kG1vMuIzsWl7dzLEcYr6kJRgLmK0w8IOwq6a1 F0kqyf2eJHOe24e/iErkKLzkZO0Pd+X8c4cVDKKcw7TEU1Q/5c/koEmgddrE4LLJBw0Z NeMVVhY2zCVPSJOEn71Bd3R2TB5jAHtbwk/0fbITCtxGNkz2Ex1w8QCiw02khrTBD6ho /O0kg0GZIUdZRxUMTFhquMUVc8AzB2XGOqT0suxe8yzTnnCFwfvx9w9XbfFdARTGzxyZ SVhA== 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 q81si6915941wrb.280.2017.05.20.08.52.41; Sat, 20 May 2017 08:52:42 -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 CEA4D68990D; Sat, 20 May 2017 18:52:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92D7E688350 for ; Sat, 20 May 2017 18:52:30 +0300 (EEST) Received: from [172.31.218.43] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dC6gA-0005pa-Sb for ffmpeg-devel@ffmpeg.org; Sat, 20 May 2017 17:52:30 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dC6g5-0003RR-1w for ffmpeg-devel@ffmpeg.org; Sat, 20 May 2017 17:52:25 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id NfsM1v01k0S5wYM01fsNxQ; Sat, 20 May 2017 17:52:23 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 20 May 2017 17:52:21 +0200 Message-Id: <20170520155221.20932-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/takdec: Fix multiple runtime error: signed integer overflow: -512 * 4563386 cannot be represented in type 'int' 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: 1706/clusterfuzz-testcase-minimized-6112772670619648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/takdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 31d703135a..65dbc060a8 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -447,12 +447,12 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded, tfilter[0] = s->predictors[0] * 64; for (i = 1; i < filter_order; i++) { - int32_t *p1 = &tfilter[0]; - int32_t *p2 = &tfilter[i - 1]; + uint32_t *p1 = &tfilter[0]; + uint32_t *p2 = &tfilter[i - 1]; for (j = 0; j < (i + 1) / 2; j++) { - x = *p1 + (s->predictors[i] * *p2 + 256 >> 9); - *p2 += s->predictors[i] * *p1 + 256 >> 9; + x = *p1 + ((int32_t)(s->predictors[i] * *p2 + 256) >> 9); + *p2 += (int32_t)(s->predictors[i] * *p1 + 256) >> 9; *p1++ = x; p2--; }