proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-12-09 18:00:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #2473: use of unitialized value

Browse Source 
With the noerr flag set in parse_volume_id we have to check if
$volname is defined before comparing it to 'cloudinit'.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
This commit is contained in:
Mira Limbeck 2019-11-21 11:04:25 +01:00 committed by Thomas Lamprecht
parent b3233604d1
commit 8f2c9019f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/API2/Qemu.pm
View File

@ -70,7 +70,7 @@ my $check_storage_access = sub {
my $volid = $drive->{file}; my $volid = $drive->{file};
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1); my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' || $volname eq 'cloudinit')) { if (!$volid || ($volid eq 'none' || $volid eq 'cloudinit' || (defined($volname) && $volname eq 'cloudinit'))) {
# nothing to check # nothing to check
} elsif ($isCDROM && ($volid eq 'cdrom')) { } elsif ($isCDROM && ($volid eq 'cdrom')) {
$rpcenv->check($authuser, "/", ['Sys.Console']); $rpcenv->check($authuser, "/", ['Sys.Console']);
@ -148,7 +148,7 @@ my $create_disks = sub {
if (!$volid || $volid eq 'none' || $volid eq 'cdrom') { if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
delete $disk->{size}; delete $disk->{size};
$res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk); $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
} elsif ($volname eq 'cloudinit') { } elsif (defined($volname) && $volname eq 'cloudinit') {
$storeid = $storeid // $default_storage; $storeid = $storeid // $default_storage;
die "no storage ID specified (and no default storage)\n" if !$storeid; die "no storage ID specified (and no default storage)\n" if !$storeid;
my $scfg = PVE::Storage::storage_config($storecfg, $storeid); my $scfg = PVE::Storage::storage_config($storecfg, $storeid);