From patchwork Wed May 10 21:28: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: 3644 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp408257vsd; Wed, 10 May 2017 14:28:41 -0700 (PDT) X-Received: by 10.223.160.70 with SMTP id l6mr5737982wrl.0.1494451721658; Wed, 10 May 2017 14:28:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494451721; cv=none; d=google.com; s=arc-20160816; b=V05xHfoCOCtDcWLN9YJx4eAByrdcEREP6814pYd7ml01/Lvo9X7lGmsj36A//mjavB aL6se02FHghjQ1TTXoRfykOoaNzfI4oRl5gQ6Am5cvUSjDB+Gyi2TCov3Ouv5f/uh4en n6QX2dHWHwR/Qk6BHYHP3P2kvmv7RR08gQ5b/EabA/FxMwz5DGjjOd8izk5brwOa+k6s 8gdPK48lJBOZZHJwyGObKdoMlLYkw2g2UPBryOoC2xRjLxsVZ7FmWlptmDqRouSuJv+1 +rmk1o3rReFhnyS9R4E1qEvUEC2c0Wzos6LcEMtQS/FjNmXhHDUrYQN3U8EfuwPli+YF /Pug== 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=OA5QqDsAADG53S9F5P8b0TmKu77rN3Fu//hZBh+t6mQ=; b=T7Q2um54TdiYpCHzsgv7Xp4fmSs8Pk6VT2Ofew1uKvZ+wCRgE7Fi/WyuyTyAWbZzVa 1VQ/FgW4anEUXkQZjM4kUDDXWQA6SxExXIWbmlGxL8ppvfs2UQDlXISpWfOWsS8Dvbk8 0C6oACgi0qF/kx05dsXlw/0eQslSUvcZMbxYotZvf8Zxk9KjVWWUQGneE0xgRKOjdyeR A0B0A4fHrwrSySwxwr5t7b8Y16/gvrrSzonY+k3ZqHAoKSFZjJIuEsd7KkH9ID1tDrVW hIKfLytoBSJ9jfC7Ev6KBNkx9r8rD93r1YuIbbzy/Wc3QFh5dsTfHSPudDxBZBjGVoB0 pxgA== 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 2si132847wrh.283.2017.05.10.14.28.41; Wed, 10 May 2017 14:28:41 -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 79DF8689230; Thu, 11 May 2017 00:28:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DC2B6883C3 for ; Thu, 11 May 2017 00:28:25 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1d8Z9r-0001X3-ON for ffmpeg-devel@ffmpeg.org; Wed, 10 May 2017 23:28:31 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id JlUN1v00y0S5wYM01lUPS2; Wed, 10 May 2017 23:28:23 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 10 May 2017 23:28:21 +0200 Message-Id: <20170510212821.21939-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avcodec/wavpack: Fix runtime error: signed integer overflow: 2147483642 + 512 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" Fixed: 1453/clusterfuzz-testcase-minimized-5024976874766336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavpack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index d2ba97ee2c..87c065c1e7 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -433,8 +433,8 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb, L2 = L + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10); R2 = R + ((s->decorr[i].weightB * (int64_t)B + 512) >> 10); } else { - L2 = L + ((s->decorr[i].weightA * A + 512) >> 10); - R2 = R + ((s->decorr[i].weightB * B + 512) >> 10); + L2 = L + ((int)(s->decorr[i].weightA * A + 512U) >> 10); + R2 = R + ((int)(s->decorr[i].weightB * B + 512U) >> 10); } if (A && L) s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;