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 F0A6F60DF4 for ; Thu, 17 Feb 2022 15:55:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E773D212BA for ; Thu, 17 Feb 2022 15:55:06 +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 CDFC2212AF for ; Thu, 17 Feb 2022 15:55:05 +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 A87F446BED for ; Thu, 17 Feb 2022 15:55:05 +0100 (CET) From: Mira Limbeck To: pve-devel@lists.proxmox.com Date: Thu, 17 Feb 2022 15:54:59 +0100 Message-Id: <20220217145459.400284-2-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220217145459.400284-1-m.limbeck@proxmox.com> References: <20220217145459.400284-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.231 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. [plugin.pm] Subject: [pve-devel] [PATCH v2 storage 2/2] file_size_info: 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:37 -0000 `qemu-img info --output=json` returns the size and used values as integers in the JSON format, but the regex match converts them to strings. As we know they only contain digits, we can simply cast them back to integers after the regex. The API requires them to be integers. Signed-off-by: Mira Limbeck --- v2: - reworded commit subject and message PVE/Storage/Plugin.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 12f1b4b..bcc0cc0 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -892,7 +892,13 @@ sub file_size_info { my ($size, $format, $used, $parent) = $info->@{qw(virtual-size format actual-size backing-filename)}; ($size) = ($size =~ /^(\d+)$/) or die "size '$size' not an integer\n"; # untaint + # the regex above changes the type of $size to 'string' + # we know it is an integer based on the regex above, so simply cast it back + # this is required by the API + $size = int($size); ($used) = ($used =~ /^(\d+)$/) or die "used '$used' not an integer\n"; # untaint + # same as $size above + $used = int($used); ($format) = ($format =~ /^(\S+)$/) or die "format '$format' includes whitespace\n"; # untaint if (defined($parent)) { ($parent) = ($parent =~ /^(\S+)$/) or die "parent '$parent' includes whitespace\n"; # untaint -- 2.30.2