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 6A1376BB5B for ; Thu, 18 Mar 2021 09:44:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C5CEE2FA for ; Thu, 18 Mar 2021 09:44:23 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 CA3C7E2EA for ; Thu, 18 Mar 2021 09:44:22 +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 8FE60427B2 for ; Thu, 18 Mar 2021 09:44:22 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 18 Mar 2021 09:44:18 +0100 Message-Id: <20210318084418.13689-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210318084418.13689-1-f.ebner@proxmox.com> References: <20210318084418.13689-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jsonschema.pm] Subject: [pve-devel] [PATCH common 2/2] schema: check format: parse list formats as arrays 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, 18 Mar 2021 08:44:53 -0000 Previously, the returned value would be only the last element or undef in case of an empty list. There's only a handful of callers of check_format() that look at the return value and AFAICT none of the exisitng ones is for a -list format. But best to avoid any future surprises. Signed-off-by: Fabian Ebner --- src/PVE/JSONSchema.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index e9d10da..0586105 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -709,9 +709,10 @@ sub check_format { if $format_type ne 'none' && ref($registered) ne 'CODE'; if ($format_type eq 'list') { + $parsed = []; # Note: we allow empty lists foreach my $v (split_list($value)) { - $parsed = $registered->($v); + push @{$parsed}, $registered->($v); } } elsif ($format_type eq 'opt') { $parsed = $registered->($value) if $value; -- 2.20.1