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

Don't leak memory when winnowing disk devices

Browse Source 
- Improve logging a little
 - Don't leak Device*, but delete the raw pointer when erasing
 - Document that DeviceInfo takes ownership and doesn't leak
This commit is contained in:
Adriaan de Groot 2017-08-30 07:50:24 -04:00 committed by Philip
parent 4f34c68a14
commit 6e2d89afd4
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/partition/core/DeviceList.cpp
View File

@ -106,12 +106,22 @@ operator <<( QDebug& s, QList< Device* >::iterator& it )
return s;
}
using DeviceList = QList< Device* >;
static inline DeviceList::iterator
erase(DeviceList& l, DeviceList::iterator& it)
{
Device* p = *it;
auto r = l.erase( it );
if (p)
delete p;
return r;
}
QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
{
bool writableOnly = (which == DeviceType::WritableOnly);
using DeviceList = QList< Device* >;
CoreBackend* backend = CoreBackendManager::self()->backend();
DeviceList devices = backend->scanDevices( true );
@ -123,8 +133,8 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
( *it )->deviceNode().startsWith( "/dev/zram" )
)
{
cDebug() << " .. Removing" << it;
it = devices.erase( it );
cDebug() << " .. Removing zram" << it;
it = erase(devices, it );
}
else if ( writableOnly && (
@ -132,13 +142,13 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
isIso9660( *it ) )
)
{
cDebug() << " .. Removing" << it;
it = devices.erase( it );
cDebug() << " .. Removing root-or-CD" << it;
it = erase(devices, it );
}
else if ( (minimumSize >= 0) && !( (*it)->capacity() > minimumSize ) )
{
cDebug() << " .. Removing too-small" << it;
it = devices.erase( it );
it = erase(devices, it );
}
else
++it;

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

@ -122,6 +122,7 @@ PartitionCoreModule::doInit()
cDebug() << "node\tcapacity\tname\tprettyName";
for ( auto device : devices )
{
// Gives ownership of the Device* to the DeviceInfo object
auto deviceInfo = new DeviceInfo( device );
m_deviceInfos << deviceInfo;
cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName();