From patchwork Mon Sep 19 16:10:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 38052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1337622pzh; Mon, 19 Sep 2022 09:10:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4cLcsa7pQfFH6dbi/+zWgkDyraUZBvu79o3RJOfQEnsOMMGlKfZyG5t65Kcw2tu5NwKKPi X-Received: by 2002:a17:907:6ea1:b0:77e:4c93:130a with SMTP id sh33-20020a1709076ea100b0077e4c93130amr13316804ejc.482.1663603854466; Mon, 19 Sep 2022 09:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663603854; cv=none; d=google.com; s=arc-20160816; b=D13VZZHEQytArdIzcd4atgK8g4oY54CJj4+XbMKs25QG31k0CfuCz/P2AHQuI+aeYS egSs7M1Woj58cslNPC5MKSDpUzyd8x1nb+/vjlTQ/gqvsceuKfy9SAMQJ0lRADUKdJrr zk3iF7Odvu21OT1MZoEdJETM/Bcav5kGzf6t3ZUZIqLxfCsrApxF+P7XpaUh5sFa9zUV MIXretHh3ecIZCAqay06uQJXJn9/r7SaEshPKbyYB3/i/Meb6JxTi4k5r3iXaoTL8TLJ 8Tz5GxL04Abr9eTpsauRn3g8E5eglCIWj+/1pB8qts0YgYgo1kkimKE0NtasT/nix7b9 Cq6A== 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:delivered-to; bh=Sd8G9AASFkC9gbd7nws/IjwHTabli8V2hHZVRraR1Bs=; b=VT3sCMQYhNKo5jopCFqZH/FL+mOHBmnSdl6uPU+csPK45Q557R2SiYFPIk9uUFK3n9 C6dntvNNwrVIG/0tUyXTPt5KtMf+pHa4R1YAUSe9eZvmryklkucgn3F/ttK/pzj7lth6 c2wMU7mhikkW7S/upYNDVun68GaEJS+BIMxx8+l+E2D0kgD4e/9zXmrU3v1s1AqpAVmZ xeVurlHnnmhVdLJujOh9Js53alU0jj9pqll0+tbt8b/16yzDI3CPsefBzG3RODc5mEOS OVM/zss9cVOzUMlXOooqrktcsoKrzFjQgxpeKlfJflr+klwIdMqQjrw5otxzd8UXFXL7 27+g== 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 h11-20020a170906854b00b0073d626e2ef8si11714131ejy.461.2022.09.19.09.10.53; Mon, 19 Sep 2022 09:10:54 -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 1718D68BCB5; Mon, 19 Sep 2022 19:10:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CC3968BC63 for ; Mon, 19 Sep 2022 19:10:45 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id C6B9FC0088 for ; Mon, 19 Sep 2022 19:10:44 +0300 (EEST) From: remi@remlab.net To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Sep 2022 19:10:42 +0300 Message-Id: <20220919161044.19545-1-remi@remlab.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <170537ff-c751-1f40-49aa-d1dfe8b77ce8@gmail.com> References: <170537ff-c751-1f40-49aa-d1dfe8b77ce8@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv3 1/3] lavc/vorbisdec: use ptrdiff_t to iterate over intptr_t 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: yoj+GtpM0eGc From: Rémi Denis-Courmont While this probably never overflows, we are better safe than sorry. The callback prototype should probably also use ptrdiff_t or size_t, but I diggress (this would affect the DSP callback prototype). --- libavcodec/ppc/vorbisdsp_altivec.c | 4 ++-- libavcodec/vorbisdec.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index 4dabf2dc7d..c298d8cae3 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -31,12 +31,12 @@ static void vorbis_inverse_coupling_altivec(float *mag, float *ang, intptr_t blocksize) { - int i; vector float m, a; vector bool int t0, t1; const vector unsigned int v_31 = //XXX vec_add(vec_add(vec_splat_u32(15),vec_splat_u32(15)),vec_splat_u32(1)); - for (i = 0; i < blocksize; i += 4) { + + for (ptrdiff_t i = 0; i < blocksize; i += 4) { m = vec_ld(0, mag+i); a = vec_ld(0, ang+i); t0 = vec_cmple(m, (vector float)vec_splat_u32(0)); diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 38a5367be3..bfc4be6fc6 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1581,8 +1581,7 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize) { - int i; - for (i = 0; i < blocksize; i++) { + for (ptrdiff_t i = 0; i < blocksize; i++) { if (mag[i] > 0.0) { if (ang[i] > 0.0) { ang[i] = mag[i] - ang[i];