From 22cb4b0b7812658ecc2444ca3ee51a04c50e4f57 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 30 Apr 2024 09:53:42 +0200 Subject: [PATCH] don't bail on whitespaces in backing devices This prevents importing from vmdks with whitespaces in file names. Further, some operations that include file sizes (like listing disks) would potentially fail entirely if a custom disk with a badly name backing device exists in a VM images directory since they don't expect this. Specifically, since we don't necessarily know the actual naming scheme of the current storage in the plain Plugin.pm version, we don't check the full name anyway, so why bother with whitespaces... See-also: https://forum.proxmox.com/threads/new-import-wizard-available-for-migrating-vmware-esxi-based-virtual-machines.144023/page-16#post-658697 Signed-off-by: Wolfgang Bumiller --- src/PVE/Storage/Plugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 22a9729..683190b 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -982,7 +982,7 @@ sub file_size_info { $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 + ($parent) = ($parent =~ /^(\S+)$/); # untaint } return wantarray ? ($size, $format, $used, $parent, $st->ctime) : $size; }