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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 88403610BD for ; Fri, 18 Feb 2022 08:36:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BBF626DF3 for ; Fri, 18 Feb 2022 08:36:09 +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 B763326DD5 for ; Fri, 18 Feb 2022 08:36:08 +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 9169C41C51 for ; Fri, 18 Feb 2022 08:36:08 +0100 (CET) Message-ID: Date: Fri, 18 Feb 2022 08:36:03 +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 References: <20220217145459.400284-1-m.limbeck@proxmox.com> <20220217145459.400284-2-m.limbeck@proxmox.com> From: Fabian Ebner In-Reply-To: <20220217145459.400284-2-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 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: Fri, 18 Feb 2022 07:36:39 -0000 Am 17.02.22 um 15:54 schrieb Mira Limbeck: > `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 Nit: Not sure if it's worth to put such a lengthy comment rather than something like "coerce back from string". One can still read the commit message in the git history if there ever is confusion about why it's there. > + $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