From 086c4bf12ba95b487aec434b4021d4b716a9e602 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 20 Jan 2017 10:03:34 +0100 Subject: [PATCH] extract_vzdump_config: handle RE consistently MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- PVE/Storage.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index b9ea42a..eb7000f 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1327,7 +1327,7 @@ sub extract_vzdump_config_tar { my $file; while (defined($file = <$fh>)) { - if ($file =~ m!$conf_re!) { + if ($file =~ $conf_re) { $file = $1; # untaint last; } @@ -1414,7 +1414,7 @@ sub extract_vzdump_config { my $archive = abs_filesystem_path($cfg, $volid); if ($volid =~ /vzdump-(lxc|openvz)-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|(tar(\.(gz|lzo))?))$/) { - return extract_vzdump_config_tar($archive,'^(\./etc/vzdump/(pct|vps)\.conf)$'); + return extract_vzdump_config_tar($archive, qr!^(\./etc/vzdump/(pct|vps)\.conf)$!); } elsif ($volid =~ /vzdump-qemu-\d+-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(gz|lzo))?))$/) { my $format; my $comp; -- 2.39.2