napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Avoid uninitialized variable

Browse Source 
- if the partition size is invalid, then warn about it but do
  not print the (uninitialized) size of the partition.
- shuffle code to continue earlier, allowing the "good path"
  code to be out-dented.
This commit is contained in:
Adriaan de Groot 2020-10-23 22:34:53 +02:00
parent 687a795b71
commit 9910b23152
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/modules/partition/core/PartitionLayout.cpp
View File

@ -172,32 +172,30 @@ PartitionLayout::execute( Device* dev,
// Let's check if we have enough space for each partSize // Let's check if we have enough space for each partSize
for ( const auto& part : qAsConst( m_partLayout ) ) for ( const auto& part : qAsConst( m_partLayout ) )
{ {
qint64 size; if ( !part.partSize.isValid() )
// Calculate partition size
if ( part.partSize.isValid() )
{ {
// We need to ignore the percent-defined cWarning() << "Partition" << part.partMountPoint << "size is invalid, skipping...";
if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent ) continue;
{ }
size = part.partSize.toSectors( totalSize, dev->logicalSize() );
} // Calculate partition size: Rely on "possibly uninitialized use"
else // warnings to ensure that all the cases are covered below.
{ qint64 size;
if ( part.partMinSize.isValid() ) // We need to ignore the percent-defined until later
{ if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
size = part.partMinSize.toSectors( totalSize, dev->logicalSize() ); {
} size = part.partSize.toSectors( totalSize, dev->logicalSize() );
else
{
size = 0;
}
}
} }
else else
{ {
cWarning() << "Partition" << part.partMountPoint << "size (" << size << "sectors) is invalid, skipping..."; if ( part.partMinSize.isValid() )
continue; {
size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
}
else
{
size = 0;
}
} }
partSizeMap.insert( &part, size ); partSizeMap.insert( &part, size );