From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 5E0EB610CB
for <pve-devel@lists.proxmox.com>; Fri, 18 Feb 2022 08:36:43 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5516A26DFF
for <pve-devel@lists.proxmox.com>; Fri, 18 Feb 2022 08:36:13 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id D75E326DF4
for <pve-devel@lists.proxmox.com>; Fri, 18 Feb 2022 08:36:12 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B1C5041C51
for <pve-devel@lists.proxmox.com>; Fri, 18 Feb 2022 08:36:12 +0100 (CET)
Message-ID: <89ab4a23-dee4-bbf1-3d62-615f9f0985f9@proxmox.com>
Date: Fri, 18 Feb 2022 08:36:12 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.5.0
Content-Language: en-US
To: pve-devel@lists.proxmox.com, Mira Limbeck <m.limbeck@proxmox.com>
References: <20220217145459.400284-1-m.limbeck@proxmox.com>
From: Fabian Ebner <f.ebner@proxmox.com>
In-Reply-To: <20220217145459.400284-1-m.limbeck@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.133 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.001 Looks like a legit reply (A)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: Re: [pve-devel] [PATCH v2 storage 1/2] fix #3894: cast 'size' and
'used' to integer
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 18 Feb 2022 07:36:43 -0000
Am 17.02.22 um 15:54 schrieb Mira Limbeck:
> Perl's automatic conversion can lead to integers being converted to
> strings, for example by matching it in a regex.
>
> To make sure we always return an integer in the API calls, add
> explicit casts to integer.
>
> Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
> ---
> v2: new
>
> PVE/API2/Storage/Content.pm | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/API2/Storage/Content.pm b/PVE/API2/Storage/Content.pm
> index 45b8de8..42bff81 100644
> --- a/PVE/API2/Storage/Content.pm
> +++ b/PVE/API2/Storage/Content.pm
> @@ -140,6 +140,8 @@ __PACKAGE__->register_method ({
> eval { PVE::Storage::check_volume_access($rpcenv, $authuser, $cfg, undef, $item->{volid}); };
> next if $@;
> $item->{vmid} = int($item->{vmid}) if (defined($item->{vmid}));
> + $item->{size} = int($item->{size}) if (defined($item->{size}));
> + $item->{used} = int($item->{used}) if (defined($item->{used}));
Style nit: superfluous parentheses (of course the pre-existing one is to
blame ;))
> push @$res, $item;
> }
>
> @@ -326,8 +328,8 @@ __PACKAGE__->register_method ({
>
> my $entry = {
> path => $path,
> - size => $size,
> - used => $used,
> + size => int($size), # cast to integer in case it was changed to a string previously
> + used => int($used),
Style nit: please fix the pre-existing white-space error while modifying
the line
> format => $format,
> };
>
Just minor nits, so both patches:
Reviewed-by: Fabian Ebner <f.ebner@proxmox.com>