[partition] Reduce scope for nullptr dereference

- document what types are in use - avoid at least one nullptr deref
6 years ago · e0a79f4c0f
parent 1660e15eda
commit e0a79f4c0f
1 changed files with 5 additions and 2 deletions
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@ -946,9 +946,12 @@ PartitionCoreModule::revertDevice( Device* dev, bool individualRevert )
    m_deviceModel->swapDevice( dev, newDev );

    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;
        else
            devices.append( info->device.data() );