From patchwork Sun May 19 02:49:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49005 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3719696pzb; Sat, 18 May 2024 19:50:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUztdQUh6xRl1CBkmhxF6xDu2/map6Mww91wiBXX+FL5IZZDZb2cOCEaD5/4AXXM4eNdnn9wWLg7Asi62nr07MbqBvy3OMez4BkYQ== X-Google-Smtp-Source: AGHT+IHjPBVrkxYzVllQbsRQW+ICvt/jGOthUmBWVQxp3/hfpbgDRlVv56RpU4EbX7OBILSpfnXo X-Received: by 2002:a17:906:c7d8:b0:a5a:8afd:33b4 with SMTP id a640c23a62f3a-a5d5db75a8cmr230662866b.37.1716087042628; Sat, 18 May 2024 19:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716087042; cv=none; d=google.com; s=arc-20160816; b=caDcr7IGM7IpAwd9beDAKt5Y/1pH6xyAMl/aeFKwxbO6K6FXPCF6DL3V7PtrYdkNIJ j0RQ5WAXi2MHsCjR8DxUGw8do1ftfcKJrjB+dgV5sKqqPexK7dTM4/nebLCmYTetdzlr ZhksilPwMumneIHFmpQ4t8ykpw4SmTqHi8la3avNf3y2oN8b3zo26gJDF0Qoar1dU4Bi Lf1Z3wgU0PFJd70ua7q7voznuxkwEt1Zz617NtGN+gQhaa0Iv2DdRuOSS1CwdbYE+SRc EiZ17tMOUI9Mv7TqPxIW5lySogBS8pc/5520pz3+27zYZuZEZ6q2ZFNPu0BpJrq55yla Kd0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xgpL+K2/WJsihhDEZON4BWBHHrKS8SaHzF7giMUUCZo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=OzL0oWDUHdmx/BTUYYuxNVrAI5EIp7VFfQ6inXDwYh+dw2AhUhFK1FlhZkiNt3mvaD c1G6w7lLhn3d5EdjZ9uYW/ytwh/cQq8/8ltZQVaC2ojp+3WqJJRxtDCQySTnxpOmYaEG NGJk5ma5F0MyMagfXX4AhTok5ujUUpmSobKcO7z+f6N2s6jRnq8eLzfLDSc1Q0qd2CNS mC8FtQJAKFhTrGRbNjsZWiFDHIKLHZIhncFCbCXF1jhM6MtZPCkszyLhdEi5LsTY/ncE /N+8qPyNRtHk/hkaq18FSfEu3tOo4miw5IXYNUdr7YsTYB28bwZrT6eaMDMCkq+r6NJp 4DzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=IaPe9EVt; 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 a640c23a62f3a-a5a17be6550si1115032466b.768.2024.05.18.19.50.42; Sat, 18 May 2024 19:50: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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=IaPe9EVt; 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 A81F368D261; Sun, 19 May 2024 05:49:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49A8968D22E for ; Sun, 19 May 2024 05:49:26 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id A51AF1BF205 for ; Sun, 19 May 2024 02:49:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716086965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ShEJe58og+Vpobs+PzNSTrJqv+1F942gfm/7odkXsrg=; b=IaPe9EVtelBF55TUTCRRhFP4sSJgbXxy4F05NHx70ngOedtHMOpv3ZkowkRo+cTizW5UoZ Vc9bSERPUJHtOj2FhpRZ06DYIpg6vq5vh14RY7MKr9nQE5BJRVopE2079UaCOjorNZhgQa zfSi50AKapzsu4RoOffHEHkHOMFhCdbKCaR+qYqOBmgKhyNqDNGggo4Oq0aaW9UYRlMp+o FmXGTuZAeGEKuj8E8nWVZ1BvhuXE3uUhJm8zIGW5/LxGcuA7NMU3vrHAdKBC4ZIPdPZQXD tbMIfB0ZWTHiw9IR+H7EnVVRy1U8qrULXgZaPRgtxvCqJu42RDaEzqFsJfv+KQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 May 2024 04:49:15 +0200 Message-ID: <20240519024915.1944150-9-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240519024915.1944150-1-michael@niedermayer.cc> References: <20240519024915.1944150-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 9/9] avcodec/wavpackenc: Use unsigned for potential 31bit shift X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: DALh24B7Pvpi Fixes: CID1465481 Unintentional integer overflow Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/wavpackenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index ba0371592d9..e99ab951d41 100644 --- a/libavcodec/wavpackenc.c +++ b/libavcodec/wavpackenc.c @@ -1979,7 +1979,7 @@ static void encode_flush(WavPackEncodeContext *s) put_bits(pb, 31, 0x7FFFFFFF); cbits -= 31; } else { - put_bits(pb, cbits, (1 << cbits) - 1); + put_bits(pb, cbits, (1U << cbits) - 1); cbits = 0; } } while (cbits); @@ -2008,7 +2008,7 @@ static void encode_flush(WavPackEncodeContext *s) put_bits(pb, 31, 0x7FFFFFFF); cbits -= 31; } else { - put_bits(pb, cbits, (1 << cbits) - 1); + put_bits(pb, cbits, (1U << cbits) - 1); cbits = 0; } } while (cbits);