From patchwork Tue May 23 22:21: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: 3724 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp24122vsk; Tue, 23 May 2017 15:21:44 -0700 (PDT) X-Received: by 10.28.6.82 with SMTP id 79mr3903133wmg.124.1495578104043; Tue, 23 May 2017 15:21:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495578104; cv=none; d=google.com; s=arc-20160816; b=ufn1yaKNOGddlws/I301x1J+tvI0jRyh/aP3EwwSDnosdWh1ajbn+l3WsoFaeYqq3C KVDa2O59weCQ/Uf2o35SF+LHgfZkifnH/cnufcRXPxP9rxMnr4nY8Y8GL2zdyCYu+f4d BqUWyiIxYaqzWwB7Dx8vzjR7nJEBNhSjMQNkPQT2DBz/CNueVFOk60tPbKTNyscnqOj3 N3sVCRtdhM3JGigHxVHc98Q3XVYP4jTd75KrIMsMZRHJlcWP5cqS2thrOx71eBKtfjk2 E8mr8AEnGjUTfQSCRp1x9Sz5EZ9NwmcyuBWgz/u6JDPjlYEIV/O/bQmSkokUKNHF4/K5 +rkQ== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=JdWsN/tJTrZSvVsoXWUni5nP0IMfeuiLs84ueB1wzVg=; b=U16ocozjABWzkqLwIQi4QWdrz88sPLd7dXOcuRTBSZD8oJI3vzZgTh4QJQqUq5XHRu vXMHA8OaqhDLNanHGn3lZIhGhy9XB33Oho83u2/XZzlT6TKNh96M2xQUpobdguxWQKoT FQK7NOFVaOcTs0xCDz5Odi0rwXnP+vyq3WsDuneRpcUHLw/1dOScJx7QoCO3uZsTjv2I ISNmZ9n5oaDoNS3H7j5LAquDSTeWvjzIwvQAbEnjP+Vl/khwlaXPawoIpYGe/tFU/sYv D87304pLZ+HACfo0sog+0HJagw5CsICKGPpPsyWPqVuX6gm5B6VVMaRvFp9GJ7pR8yZm L7og== 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 l19si14933036wrb.169.2017.05.23.15.21.43; Tue, 23 May 2017 15:21:44 -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 A01ED689776; Wed, 24 May 2017 01:21:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F4D5687EB3 for ; Wed, 24 May 2017 01:21:32 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dDIBJ-0001D8-Rf for ffmpeg-devel@ffmpeg.org; Wed, 24 May 2017 00:21:33 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id PyMP1v0220S5wYM01yMQK8; Wed, 24 May 2017 00:21:24 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 24 May 2017 00:21:21 +0200 Message-Id: <20170523222121.2867-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170523222121.2867-1-michael@niedermayer.cc> References: <20170523222121.2867-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/wavpack: Fix runtime error: left shift of negative value -14778 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: 1778/clusterfuzz-testcase-minimized-5128953268273152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/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 1b13b676b6..c26a2c8134 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -113,10 +113,10 @@ static int update_error_limit(WavpackFrameContext *ctx) if (ctx->stereo_in && ctx->hybrid_bitrate) { int balance = (sl[1] - sl[0] + br[1] + 1) >> 1; if (balance > br[0]) { - br[1] = br[0] << 1; + br[1] = br[0] * 2; br[0] = 0; } else if (-balance > br[0]) { - br[0] <<= 1; + br[0] *= 2; br[1] = 0; } else { br[1] = br[0] + balance;