From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 48F8160E5A for ; Thu, 17 Feb 2022 15:55:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 399FD212AE for ; Thu, 17 Feb 2022 15:55:04 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 0791B212A2 for ; Thu, 17 Feb 2022 15:55:03 +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 D1B4846DC6 for ; Thu, 17 Feb 2022 15:55:02 +0100 (CET) From: Mira Limbeck To: pve-devel@lists.proxmox.com Date: Thu, 17 Feb 2022 15:54:58 +0100 Message-Id: <20220217145459.400284-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.242 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [content.pm] Subject: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Feb 2022 14:55:34 -0000 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 --- 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})); 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), format => $format, }; -- 2.30.2