From 7c1617b01d1154d5056428c0a4a394845b0c3b40 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 2 Nov 2016 12:08:33 +0100 Subject: [PATCH] JSONSchema: named formats in parse_property_string While our code currently passes the format hashes directly, some code gets them via the format property of a configuration description which verifies successfully via check_format() for named property string formats, so this should be allowed. --- src/PVE/JSONSchema.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index debbbb5..961dfbe 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -506,6 +506,17 @@ sub parse_property_string { # In property strings we default to not allowing additional properties $additional_properties = 0 if !defined($additional_properties); + # Support named formats here, too: + if (!ref($format)) { + if (my $desc = $format_list->{$format}) { + $format = $desc; + } else { + die "unknown format: $format\n"; + } + } elsif (ref($format) ne 'HASH') { + die "unexpected format value of type ".ref($format)."\n"; + } + my $default_key; my $res = {}; -- 2.39.2