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

[partition] Reduce scope for nullptr dereference

Browse Source 
- document what types are in use
 - avoid at least one nullptr deref
This commit is contained in:
Adriaan de Groot 2019-05-03 08:47:34 -04:00
parent 1660e15eda
commit e0a79f4c0f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -946,9 +946,12 @@ PartitionCoreModule::revertDevice( Device* dev, bool individualRevert )
m_deviceModel->swapDevice( dev, newDev ); m_deviceModel->swapDevice( dev, newDev );
QList< Device* > devices; QList< Device* > devices;
for ( auto info : m_deviceInfos ) for ( DeviceInfo* const info : m_deviceInfos )
{ {
if ( info->device.data()->type() != Device::Type::Disk_Device ) // device is a QScopedPointer
if ( !info || info->device.isNull() )
continue;
if ( info->device->type() != Device::Type::Disk_Device )
continue; continue;
else else
devices.append( info->device.data() ); devices.append( info->device.data() );