applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-27 01:15:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

PartitionModule: avoid nullptr crashes

Browse source 
Fix up iterator code so that it handles nullptr better.
This avoids part of #686.
This commit is contained in:
Adriaan de Groot 2017-06-14 11:39:53 -04:00
parent 3677708d3e
commit 92a2c7aa70
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/partition/core/PartitionCoreModule.cpp
View file

@ -157,9 +157,9 @@ PartitionCoreModule::doInit()
// Remove the device which contains / from the list
for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); )
if ( hasRootPartition( *it ) ||
if ( *it && ( hasRootPartition( *it ) ||
(*it)->deviceNode().startsWith( "/dev/zram") ||
isIso9660( *it ) )
isIso9660( *it ) ) )
it = devices.erase( it );
else
++it;